*** empty log message ***

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 886a1111be40c3056cd2a8078e0c34b994612520..60808898339361e3b70a53b21b6ac03c325713d7 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,7 +9,7 @@ import java.awt.event.*;
  * @version 1
  */
  
-public class MooNoteElement extends JPanel {
+public class MooNoteElement extends JPanel implements Comparable{
 
        private MooTrackView mtv;
        private MooNote note;
@@ -17,7 +17,7 @@ public class MooNoteElement extends JPanel {
        private JMenuItem popupRemove, popupProp, popupTranspOctUp, popupTranspOctDown;
        private Rectangle pitchRect, veloRect;
        private String notePitch, noteVelocity;
-       private boolean selected = false;
+       private boolean selected = false, leftMouseButtonPressed = false, mouseIn = false;
        public Color textColor;
        public static final Color bgColor = new Color(160, 218, 255);
        public static final Color invBgColor = new Color(96, 38, 0);
@@ -65,6 +65,14 @@ public class MooNoteElement extends JPanel {
                return note;
        }
 
+       /** 
+        * Compares the note of this element to that of another note.
+        * @return a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than the specified object
+        */
+       public int compareTo(Object o) {
+               return note.compareTo(((MooNoteElement)o).getNote());
+       }
+
        /** 
         * Selects the current NoteElement.
         */
@@ -176,15 +184,22 @@ public class MooNoteElement extends JPanel {
        class MAdapter extends MouseAdapter {
        
                /**
-                * If left mouse button is clicked, selects the note and plays it.
+                * Selects the note if mouse entered with the left mouse button pressed.
                 */
-               public void mouseClicked(MouseEvent e) {
-                       if (SwingUtilities.isLeftMouseButton(e) && !e.isControlDown()) {
+               public void mouseEntered(MouseEvent e) {
+                       mouseIn = true;
+                       if (mtv.isLeftMouseButtonPressed()) {
                                select();
-                               // Play the note
                        }
                }
 
+               /**
+                * Registers mouse exited.
+                */
+               public void mouseExited(MouseEvent e) {
+                       mouseIn = false;
+               }
+
                /**
                 * Checks if the mouse is pressed.
                 * Increases the pitch or velocity if the right mouse button is pressed while holding CTRL.
@@ -212,21 +227,32 @@ public class MooNoteElement extends JPanel {
                                        calculateString();
                                        repaint();
                                }
-                       } else maybeShowPopup(e);
+                       } else {
+                               select();
+                               // Play the note
+                               maybeShowPopup(e);
+                       }
                }
 
                public void mouseReleased(MouseEvent e) {
-                       maybeShowPopup(e);
+                       if (!maybeShowPopup(e) && !mouseIn) {
+                               int y = e.getY();
+                               if (y < 0) mtv.maybeMoveSelectedNotes((int)Math.floor((double)y / MooTrackView.NOTE_HEIGHT) * MooTrackView.NOTE_HEIGHT);
+                               if (y > getHeight()) mtv.maybeMoveSelectedNotes((int)Math.ceil(((double)y - getHeight()) / MooTrackView.NOTE_HEIGHT) * MooTrackView.NOTE_HEIGHT);
+                               
+                       }
                }
 
                /**
                 * Shows the menu if an OS-specific popup-trigger was activated.
                 */
-               private void maybeShowPopup(MouseEvent e) {
-                       if (e.isPopupTrigger() && !e.isControlDown()) {
+               private boolean maybeShowPopup(MouseEvent e) {
+                       if (!e.isPopupTrigger()) return false;
+                       if (!e.isControlDown()) {
                                if (!selected || mtv.isTheOnlySelected((MooNoteElement)e.getComponent())) popup.show(e.getComponent(), e.getX(), e.getY());
                                else mtv.showSelectionPopup(e.getComponent(), e.getX(), e.getY());
                        }
+                       return true;
                }
        }
 
@@ -237,8 +263,11 @@ public class MooNoteElement extends JPanel {
                public void actionPerformed(ActionEvent e) {
                        Object source = e.getSource();
                        if (source == popupProp) {
+                               System.out.println("Duration: " + note.getDuration());
                                new MooDialog(note);
+                               System.out.println("Duration: " + note.getDuration());
                                newLayout();
+                               repaint();
                        } else if (source == popupRemove) {
                                remove();
                        } else if (source == popupTranspOctUp) {