Changeset 1555

Timestamp:

05/10/21 11:11:48 (3 years ago)

Author:

davidb

Message:

Merging in minor tweaks from the mozart's laptop branch of the code

File:

• trunk/src/org/apollo/AudioFrameMouseActions.java (modified) (5 diffs)

trunk/src/org/apollo/AudioFrameMouseActions.java

@@ -30 +30 @@
 public class AudioFrameMouseActions implements MouseMotionListener, MouseListener {
         
-        private static final int COARSE_X_PLACEMENT_TOLERANCE = 80; // The minium distance from a track widet to auto-align free space items to
+        private static final int COARSE_X_PLACEMENT_TOLERANCE = 80; // The minimum distance from a track widget to auto-align free space items to
 
         private static final int COARSE_Y_PLACEMENT_TOLERANCE = 20; 
@@ -39 +39 @@
         private static List<Item> anchoringItems = new LinkedList<Item>();
 
+        protected static boolean hasTimeline()
+        {
+                return FrameLayoutDaemon.inferCurrentTotalMSTime()>0;
+        }
+    
         public void mouseDragged(MouseEvent e) {
                 FrameMouseActions.getInstance().mouseDragged(e);
@@ -155 +160 @@
                 }
                 
-                // Expeditees frame mouse actions uses an offset and fights over free-item
+                // Expeditee's frame mouse actions uses an offset and fights over free-item
                 // movement if it listens to the mouse event router... therefore add an extra
                 // layer to avoid this... otherwise auto-aligned items jitter like crazy while
@@ -179 +184 @@
 
         public void mousePressed(MouseEvent e) {
-                isAnchoring = (e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) != 0;
-                isStamping = (e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) != 0;
+                if (hasTimeline()) {
+                        isAnchoring = (e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) != 0;
+                        isStamping = (e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) != 0;
+                }
+
                 FrameMouseActions.getInstance().mousePressed(e);
         }
@@ -303 +311 @@
          */
         public static boolean isYAxisRestictionOn() {
-                return AudioFrameKeyboardActions.isControlDown && !AudioFrameKeyboardActions.isShiftDown;
+                if (!hasTimeline()) {
+                        return false;
+                }
+                else {
+                        return AudioFrameKeyboardActions.isControlDown && !AudioFrameKeyboardActions.isShiftDown;
+                }
         }
         
         public static boolean isSnapOn() {
-                return AudioFrameKeyboardActions.isShiftDown && !AudioFrameKeyboardActions.isControlDown;
+                if (!hasTimeline()) {
+                        return false;
+                }
+                else {
+                        return AudioFrameKeyboardActions.isShiftDown && !AudioFrameKeyboardActions.isControlDown;
+                }
         }