X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=1b090ffcf89689d373ecf0fc3f7c3d29edcb9222;hb=9becc0105a709c62132cc6ff111ba1943ebb32de;hp=712918afad081ed3d712349577e475b69e1a1d2c;hpb=575519a1889993d4d2928f761dc172002275dd20;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index 712918a..1b090ff 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -18,6 +18,7 @@ public class MooTrackView extends JPanel implements ActionListener {
 	private Rectangle box;
 	private JPopupMenu popup;
 	private JMenuItem menuItem;
+	protected static int viewLength = 0;
 	
 
 	public MooTrackView (Track track) {
@@ -66,14 +67,17 @@ public class MooTrackView extends JPanel implements ActionListener {
 		private int trackLength;
 
 		public NoteArea(Track track) {
-			System.out.println("Creating track view...");
+			// Configuring panel
 			setLayout(null);
 			trackLength = 140;
-			setPreferredSize(new Dimension(200,140*NOTE_HEIGHT));
+			setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+
+			// Temporary variables
 			MidiEvent note;
 			MooNoteElement elem;
-			boolean isOccupied;
 			int x, y, height;
+
+			// Placing note elements
 			Insets insets = getInsets();
 			for (int i = 0; i < track.size(); i++) {
 				note = track.get(i);
@@ -83,16 +87,17 @@ public class MooTrackView extends JPanel implements ActionListener {
 					elem = new MooNoteElement(mn);
 					add(elem);
 
-					// Places the note element in the appropriate place.
+					// Moves the note element to the appropriate place.
 					x = insets.left;
 					y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
-					height = NOTE_HEIGHT;
-					// height = (mn.getDuration() / 24) * NOTE_HEIGHT;
-					// System.out.println("Comp at: " + x + ", " + y + " is: " + findComponentAt(x + 10, y + 10));
+					height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+					if (height == 0) height = NOTE_HEIGHT;
 					while(findComponentAt(x, y) instanceof MooNoteElement ||
 					      findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
 					elem.setBounds(x, y, NOTE_WIDTH, height);
+					if (viewLength < (y + height)) viewLength = y + height;
 				}
+				setPreferredSize(new Dimension(200,viewLength));
 			}
 			validate();
 		}
@@ -100,7 +105,7 @@ public class MooTrackView extends JPanel implements ActionListener {
 		public void paintComponent(Graphics g) {
 			super.paintComponent(g);
 			Graphics2D g2 = (Graphics2D)g;
-			for (int c = 0; c < (trackLength*NOTE_HEIGHT); c += NOTE_HEIGHT) {
+			for (int c = 0; c < viewLength ; c += NOTE_HEIGHT) {
 				for (int r = 0; r < (10*NOTE_WIDTH); r += NOTE_WIDTH) {
 					box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
 					g2.setColor(Color.gray);
@@ -125,4 +130,4 @@ public class MooTrackView extends JPanel implements ActionListener {
 			}
 		}
 	}
-}
+}
\ No newline at end of file