Fixed the select function.

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 3a068cd67908b13456b1ae0bf014401ff7f0cd7c..43b7b27ff6153bad1673dc63df67066222df46f2 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -13,11 +13,11 @@ public class MooNoteElement extends JPanel {
 
        private MooTrackView mtv;
        private MooNote note;
-       private boolean selected;
        private Rectangle pitchRect, veloRect;
+       public Color textColor;
        public static final Color bgColor = new Color(160, 218, 255);
-       private String notePitch;
-       private String noteVelocity;
+       public static final Color invBgColor = new Color(96, 38, 0);
+       private String notePitch, noteVelocity;
        private JPopupMenu popup;
        private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown;
 
@@ -30,9 +30,10 @@ public class MooNoteElement extends JPanel {
                mtv = parent;
                note = mn;
                calculateString();
+               addMouseListener(new MAdapter());
                setBorder(BorderFactory.createLineBorder(Color.black));
                setBackground(bgColor);
-               addMouseListener(new MAdapter());
+               textColor = Color.black;
 
                // Defines coordinates.
                pitchRect = new Rectangle(0, 0, 15, 10);
@@ -53,15 +54,6 @@ public class MooNoteElement extends JPanel {
                popupTransposeOctDown = new JMenuItem("Transpose one octave down");
                popupTransposeOctDown.addActionListener(pList);
                popup.add(popupTransposeOctDown);
-
-       }
-
-       /** 
-        * Returns true if the current NoteElement is selected, otherwise false.
-        * @return if the element is selected
-        */
-       public boolean isSelected() {
-               return selected;
        }
 
        /** 
@@ -74,10 +66,22 @@ public class MooNoteElement extends JPanel {
 
        /** 
         * Selects the current NoteElement.
-        * @param state if the element should be selected
         */
-       public void setSelected(boolean state) {
-               selected = state;
+       public void select() {
+               mtv.addSelected(this);
+               setBackground(invBgColor);
+               textColor = Color.white;
+               repaint();
+       }
+
+       /** 
+        * Deselects the current NoteElement.
+        */
+       public void deselect() {
+               // mtv.removeSelected(this);
+               setBackground(bgColor);
+               textColor = Color.black;
+               repaint();
        }
 
        /**
@@ -89,6 +93,7 @@ public class MooNoteElement extends JPanel {
                super.paintComponent(g);
                if (!(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
+               g2.setColor(textColor);
                g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
        /*
                switch(columns) {
@@ -136,13 +141,14 @@ public class MooNoteElement extends JPanel {
        class MAdapter extends MouseAdapter {
        
                public void mouseClicked(MouseEvent e) {
+                       select();
                        // Play the note
                }
 
                /**
                 * Checks if the mouse is pressed.
-                * Increases the pitch or velocity if the right mousebutton is pressed while holding ctrl down.
-                * Decreases the pitch or velocity if the left mousebutton is pressed while holding ctrl down.
+                * Increases the pitch or velocity if the right mouse button is pressed while holding CTRL.
+                * Decreases the pitch or velocity if the left mouse button is pressed while holding CTRL.
                 * @param e the event recieved.
                 */
                public void mousePressed(MouseEvent e) {