X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNoteElement.java;h=9ed1ab9b2004f4a4023cd1467b7343c5ea9e8fd8;hb=a8dda23889d7c48a8b3313e2a141ed378bf8ff1c;hp=67555fcf5ccc80c45c85c7512b7ae69f1928ccd3;hpb=a8b0b5e27d120df964c5b6d8554a6207951b00d0;p=moosique.git

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 67555fc..9ed1ab9 100644
--- 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);
@@ -87,6 +87,15 @@ public class MooNoteElement extends JPanel {
 		repaint();
 	}
 
+	/** 
+	 * Transposes the current note element the given number of halftones.
+	 * @param halftones	the number of halftones to transpose - positive for up, negative for down
+	 */
+	public void transpose(int halftones) {
+		note.transpose(halftones);
+		update();
+	}
+
 	/**
 	 * Draws the string that shows the note's properties.
 	 * @param g	The Graphics object used to draw the strings.
@@ -155,26 +164,34 @@ public class MooNoteElement extends JPanel {
 	}
 
 	/**
-	 * layout this changed elemnt
+	 * Layout this changed elemnt.
 	 */
 	protected void newLayout(){
 		mtv.layoutElement(this,true);
 	}
+
 	/**
 	 * Listener that checks the mouse actions on this element.
 	 */
 	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.
@@ -202,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;
 		}
 	}
 
@@ -227,16 +250,17 @@ 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) {
-				note.transpose(12);
-				update();
+				transpose(12);
 			} else if (source == popupTranspOctDown) {
-				note.transpose(-12);
-				update();
+				transpose(-12);
 			}
 		}
 	}