X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooViewCounter.java;h=d5f8d6b49c088fac7b63c72564c4c3828f773616;hb=6501ac9c7e6f684b4853bc314f9e6a1901262c56;hp=3f646e853d4bec2ff8c7625e7dbe87008945dae5;hpb=e471d9aaa190fa2a38f3eb08bbc4c6a29681d91e;p=moosique.git

diff --git a/MooViewCounter.java b/MooViewCounter.java
index 3f646e8..d5f8d6b 100644
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -10,18 +10,17 @@ import java.awt.*;
  
 public class MooViewCounter extends JPanel {
 
-	private int timeSig1, timeSig2, measure, halfBeat, beat, halfNote;
+	private int measure, halfBeat, beat, halfNote;
 	private static final int CELL_HEIGHT = 10;
 	
 	/** 
 	 * Creates an musical ruler depending on the timesignature
 	 */
 
-	public MooViewCounter (int ts1, int ts2) {
-		timeSig1 = ts1;
-		timeSig2 = ts2;
-		setBackground(Color.black);
+	public MooViewCounter (int timeSig1, int timeSig2) {
+		setBackground(Moosique.getGUI().bgColor);
 		setPreferredSize(new Dimension(35, 200 * CELL_HEIGHT));
+
 		switch (timeSig2) {
 			case  16: measure = timeSig1;  		// 1/16
 				break;
@@ -51,10 +50,10 @@ public class MooViewCounter extends JPanel {
 
 		if (!(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
-		g2.setColor(Color.white);
+		g2.setColor(Color.black);
 		for (int c = 0; c < 200; c++) {
 			g2.drawLine(0, c * CELL_HEIGHT, 5, c * CELL_HEIGHT); 					// 1/16
-			g2.drawLine(0, c * CELL_HEIGHT * halfBeat, CELL_HEIGHT, c * CELL_HEIGHT * halfBeat);	// 1/8
+			g2.drawLine(0, c * CELL_HEIGHT * halfBeat, 10, c * CELL_HEIGHT * halfBeat);		// 1/8
 			g2.drawLine(0, c * CELL_HEIGHT * beat, 15, c * CELL_HEIGHT * beat); 			// 1/4
 			g2.drawLine(0, c * CELL_HEIGHT * halfNote, 20, c * CELL_HEIGHT * halfNote);		// 1/2
 			g2.drawLine(0, c * CELL_HEIGHT * measure, 30, c * CELL_HEIGHT * measure);		// 1/1