Fixed the move function (still buggy tho)

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 7ea74227d0be3a456226583adfa3fe9a8bed560f..459bf5bde05334adfd19919c7632c15289289831 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -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);
@@ -176,20 +176,20 @@ public class MooNoteElement extends JPanel {
        class MAdapter extends MouseAdapter {
        
                /**
-                * Selects the note if 
+                * Selects the note if mouse entered with the left mouse button pressed.
                 */
                public void mouseEntered(MouseEvent e) {
-                       if (mtv.isLeftMouseButtonPressed()) select();
+                       mouseIn = true;
+                       if (mtv.isLeftMouseButtonPressed()) {
+                               select();
+                       }
                }
 
                /**
-                * If left mouse button is clicked, selects the note and plays it.
+                * Registers mouse exited.
                 */
-               public void mouseClicked(MouseEvent e) {
-                       if (SwingUtilities.isLeftMouseButton(e) && !e.isControlDown()) {
-                               select();
-                               // Play the note
-                       }
+               public void mouseExited(MouseEvent e) {
+                       mouseIn = false;
                }
 
                /**
@@ -219,21 +219,27 @@ 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) mtv.maybeMoveSelectedNotes(getY(), getY() + e.getY());
                }
 
                /**
                 * 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;
                }
        }
 

diff --git a/MooTrackView.java b/MooTrackView.java
index a591d374853bd246647f16dd0c087ce38f58e335..bd7d7bb0b9c5a88aaf1d9909f046b27f3e0e8cc5 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -134,7 +134,7 @@ public class MooTrackView extends JPanel {
 
                // Calculates coordinates.
                x = insets.left;
-               y = insets.top + (int)(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT;
+               y = insets.top + Math.round(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT;
                height = (mn.getDuration() / ticksPerSixteenth) * NOTE_HEIGHT;
                if (height == 0) height = NOTE_HEIGHT;
                r = new Rectangle(x, y, NOTE_WIDTH, height);
@@ -318,6 +318,24 @@ public class MooTrackView extends JPanel {
                }
        }
 
+       /**
+        * Moves the current selection, if the mouse was pressed on a note element
+        * and then released in another row.
+        * @param srcY  the y-coordinate of the point in which the mouse button was pressed
+        * @param destY the y-coordinate of the point in which the mouse button was released
+        */
+       public void maybeMoveSelectedNotes(int srcY, int destY) {
+               int srcRow = (srcY - insets.top) / NOTE_HEIGHT;
+               int destRow = (destY - insets.top) / NOTE_HEIGHT;
+               long timeDiff = (long)(ticksPerSixteenth * (destRow - srcRow));
+               Iterator it = selection.iterator();
+               while(it.hasNext()) {
+                       MooNoteElement elem = (MooNoteElement)it.next();
+                       elem.getNote().setTick(elem.getNote().getTick() + timeDiff);
+                       layoutElement(elem, true);
+               }
+       }
+
        /**
         * Shows a popup-menu with options for the current selection of note elements.
         * @param c     the component over which to display the menu
@@ -380,13 +398,6 @@ public class MooTrackView extends JPanel {
                        maybeShowPopup(e);
                }
 
-               /**
-                * Selects the notes within the area that was selected.
-                */
-               public void mouseDragged(MouseEvent e) {
-                       
-               }
-
                /**
                 * Shows the menu if an OS-specific popup-trigger was activated.
                 */