no popup while pressing ctrl

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index d5e4d2a433ece1f041b1056403b473425c75d63a..1729f4aeeed79d06196fc4bb2a504de3e208b1c0 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -115,6 +115,10 @@ public class MooNoteElement extends JPanel {
                noteVelocity = ""+note.getVelocity();
        }
 
+       public MooNote getNote(){
+               return note;
+       }
+
        class MAdapter extends MouseAdapter {
                public void mousePressed(MouseEvent e) {
                        if (e.isControlDown()) {
@@ -135,7 +139,7 @@ public class MooNoteElement extends JPanel {
                                }
                                e.getComponent().repaint();
                        }
-                       if (e.isPopupTrigger()) {
+                       else if (e.isPopupTrigger()) {
                                popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
@@ -147,8 +151,13 @@ public class MooNoteElement extends JPanel {
                        if  (source == popupProp) {
                                new MooDialog(note);
                        } else if  (source == popupRemove) {
-                               mtv.remove((MooNoteElement)((JComponent)e.getSource()).getParent().getParent());
+                               remove();
                        }
                }
        }
+
+       protected void remove(){
+               mtv.remove(this);
+       }
+
 }