*** empty log message ***

[moosique.git] / MooView.java

diff --git a/MooView.java b/MooView.java
index 0e103b89774c815b7ef512afec2c445afc45d83e..ca9d68db48ad49fb5fa0732489532a92b2bb512e 100644 (file)
--- a/MooView.java
+++ b/MooView.java
@@ -10,35 +10,26 @@ import java.beans.*;
  * @author  Einar Pehrson
  */
 
-public class MooView extends JPanel {
+public class MooView extends JScrollPane {
 
        private JPanel trackPanel;
        private JPanel titlePanel;
        private int numberOfTracks;
-       private JScrollPane trackViews;
 
        /** 
         * Creates the main view
         */
        public MooView(Track[] tracks) {
-               trackViews = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+               super(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
                trackPanel = new JPanel(new GridLayout(1,3), true);
-               trackViews.setViewportView(trackPanel);
+               setViewportView(trackPanel);
 
                titlePanel = new JPanel(new GridLayout(1,3),true);
 
                JViewport columnHeader = new JViewport();
                columnHeader.setView(titlePanel);
-               trackViews.setColumnHeaderView(columnHeader);
-               numberOfTracks = tracks.length;
+               setColumnHeaderView(columnHeader);
                setTracks(tracks);
-               setLayout(new BorderLayout());
-               add(trackViews, BorderLayout.CENTER);
-
-               trackViews.addPropertyChangeListener(new PropertyChangeListener(){
-                               public void propertyChange(PropertyChangeEvent e){
-                                       System.out.println(e.getSource());
-                               }});
        }
 
        /** 
@@ -46,7 +37,8 @@ public class MooView extends JPanel {
         * @param tracks        the tracks for which to add views
         */
        public void setTracks(Track[] tracks) {
-               if (tracks.length == 1) {
+               numberOfTracks = tracks.length;
+               if (numberOfTracks == 1) {
                        // If MIDI file is of type 0, creates a view for the track.
                        trackPanel.add(new MooTrackView(tracks[0]));
                        titlePanel.add(new MooTrackTitle(tracks[0]));
@@ -63,7 +55,7 @@ public class MooView extends JPanel {
        
                        // Starts filling the track panel with track views, while updating the progress bar.
                        trackPanel.removeAll();
-                       trackPanel.setLayout(new GridLayout(1,tracks.length));
+                       trackPanel.setLayout(new GridLayout(1,numberOfTracks));
                        for (int i = 1; i < tracks.length; i++) {
                                trackPanel.add(new MooTrackView(tracks[i]));
                                titlePanel.add(new MooTrackTitle(tracks[i]));
@@ -71,8 +63,18 @@ public class MooView extends JPanel {
                        }
                        progressDialog.dispose();
                }
+/*             JPanel filler = new JPanel();
+               int totalViewLength = trackPanel.getComponents().length * MooTrackView.VIEW_WIDTH;
+               if (totalViewLength < getWidth()) {
+                       System.out.println("Adding filler since width = " + getWidth() + " and tracks = " + totalViewLength);
+                       ((GridLayout)trackPanel.getLayout()).setColumns(numberOfTracks + 1);
+                       filler.setPreferredSize(new Dimension(getWidth() - totalViewLength, 140 * MooTrackView.NOTE_HEIGHT));
+                       trackPanel.add(filler);
+                       setPreferredSize(new Dimension(getWidth(), getHeight()));
+               }
+*/
                trackPanel.validate();
-               trackViews.setViewportView(trackPanel);
+               setViewportView(trackPanel);
        }
 
        /**