X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=60808898339361e3b70a53b21b6ac03c325713d7;hb=19db604db6c736c9afc31650b2efac6eb8e2f70b;hp=7ea74227d0be3a456226583adfa3fe9a8bed560f;hpb=6154ba318198471a2b94391df6aab6f2b6cd9b29;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 7ea7422..6080889 100644
--- 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,20 +184,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 +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;
 		}
 	}
 
@@ -244,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) {