*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index cba92728796318289308ea79601c293a6989fdf0..d33f3c1f1d3191418a390e8d882fafe31cf32405 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -21,14 +21,14 @@ public class MooTrackView extends JPanel implements ActionListener {
        private JPopupMenu notePopup;
        private JMenuItem menuItem;
        protected static int viewLength = 0;
-       
+       public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
        public MooTrackView (Track track) {
                super(true);
                this.track = track;
                //setPreferredSize(new Dimension(200, 9000));
                setLayout(new BorderLayout());
-               this.setBorder(BorderFactory.createLineBorder(Color.black));
+               // setBorder(BorderFactory.createLineBorder(Color.black));
 
                //title = new MooTrackTitle(track);
                //title.setBorder(BorderFactory.createLineBorder(Color.black));
@@ -68,17 +68,14 @@ public class MooTrackView extends JPanel implements ActionListener {
        }
 
        class NoteArea extends JPanel {
-               public static final int NOTE_HEIGHT = 10;
-               public static final int NOTE_WIDTH = 40;
-               private int trackLength;
+               public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
                private ArrayList rects;
 
                public NoteArea(Track track) {
                        // Configuring panel
                        super(true);
                        setLayout(null);
-                       trackLength = 140;
-                       setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+                       setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
 
                        // Creating temporary variables
                        MidiEvent note;
@@ -106,11 +103,8 @@ public class MooTrackView extends JPanel implements ActionListener {
                                        elem.setBounds(r);
                                        rects.add(r);
                                        if (viewLength < (y + height)) viewLength = y + height;
-
-                                       // while(findComponentAt(x, y) instanceof MooNoteElement ||
-                                       //       findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
                                }
-                               setPreferredSize(new Dimension(200, viewLength));
+                               setPreferredSize(new Dimension(VIEW_WIDTH, viewLength));
                        }
                        validate();
                }
@@ -126,8 +120,8 @@ public class MooTrackView extends JPanel implements ActionListener {
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
-                       for (int c = 0; c < viewLength ; c += NOTE_HEIGHT) {
-                               for (int r = 0; r < (10*NOTE_WIDTH); r += NOTE_WIDTH) {
+                       for (int c = 0; c < viewLength || c < getHeight(); 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);
                                        g2.draw(box);