Changeset 1051

Timestamp:

04/29/16 14:17:00 (8 years ago)

Author:

davidb

Message:

Code upgraded so frame zooming is an optional (experimental) feature controlled through settings. This is because it's just to easy to be trying to resize a text item, miss by a few pixels with the mouse cursor, and then zoom the entire page accidentaly

Location:

trunk/src/org/expeditee

Files:

• gui/FrameKeyboardActions.java (modified) (7 diffs)
• settings/experimental/ExperimentalFeatures.java (modified) (1 diff)

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -53 +53 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
+import org.expeditee.settings.experimental.ExperimentalFeatures;
 import org.expeditee.settings.templates.TemplateSettings;
 import org.expeditee.stats.Formatter;
@@ -1196 +1197 @@
                 // space and return for the F keys that dont do anything in free space.
                 if (on == null) {
+                        
+                        int mouse_x = FrameMouseActions.getX(), mouse_y = FrameMouseActions.getY();
+                        
                         switch (key) {
                         // These function keys still work in free space
@@ -1205 +1209 @@
                         case Save:
                                 break;
+                                
                         case SizeDown:
-                                zoomFrame(DisplayIO.getCurrentFrame(), 0.909090909f);
-                                DisplayIO.getCurrentFrame().refreshSize();
-                                FrameKeyboardActions.Refresh();
-                                return;
+                                zoomFrameIfEnabled(DisplayIO.getCurrentFrame(), 0.909090909f, mouse_x,mouse_y);
                                 // if (isControlDown) {
                                 // UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() -
@@ -1216 +1218 @@
                                 // return;
                                 // }
+                                return;
+                                
                         case SizeUp:
-                                zoomFrame(DisplayIO.getCurrentFrame(), 1.1f);
-                                DisplayIO.getCurrentFrame().refreshSize();
-                                FrameKeyboardActions.Refresh();
+                                zoomFrameIfEnabled(DisplayIO.getCurrentFrame(), 1.1f, mouse_x,mouse_y);
+                                        // if (isControlDown) {
+                                        // UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() +
+                                        // 0.05f);
+                                        // Misc.repaint();
+                                        // return;
+                                        // }
                                 return;
-                                // if (isControlDown) {
-                                // UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() +
-                                // 0.05f);
-                                // Misc.repaint();
-                                // return;
-                                // }
+                                
                         default:
                                 MessageBay.displayMessageOnce(displayMessage);
@@ -1749 +1752 @@
         }
 
-        public static void zoomFrame(Frame frame, double scaleFactor) {
-
-                int x = FrameMouseActions.getX(), y = FrameMouseActions.getY();
+        protected static void zoomFrame(Frame frame, double scaleFactor, int x, int y) {
 
                 if (frame == null) {
@@ -1798 +1799 @@
         }
 
+        public static boolean zoomFrameIfEnabled(Frame frame, double scaleFactor, int mouse_x, int mouse_y)
+        {
+                boolean zoom_active = ExperimentalFeatures.FrameZoom.get();
+                
+                if (zoom_active) {
+                        
+                        int x, y;
+                        if (ExperimentalFeatures.FrameZoomAroundCursor.get()) {
+                                x = mouse_x;
+                                y = mouse_y;
+                        }
+                        else {
+                                x = 0;
+                                y = 0;
+                        }
+                        
+                        zoomFrame(DisplayIO.getCurrentFrame(), scaleFactor, x, y);
+                        DisplayIO.getCurrentFrame().refreshSize();
+                        FrameKeyboardActions.Refresh();
+                }
+                else {
+                        String frameZoomingDisabledMessage = "Frame Zooming currently disabled. "
+                                        + "Access Settings->Experimental->FrameZoom and set to 'true' to enable this";
+                        MessageBay.displayMessageOnce(frameZoomingDisabledMessage);
+                }
+                
+                return zoom_active;
+        }
+        
+        public static boolean zoomFrameTopLeftIfEnabled(Frame frame, double scaleFactor)
+        {
+                return zoomFrameIfEnabled(frame, scaleFactor, 0, 0);
+        }
+        
         /**
          * Adjusts the size of the given Item, by the given amount. Note: The amount
@@ -1831 +1866 @@
                                 // scale the entire frame
                                 if (diff != 0) {
-                                        zoomFrame(DisplayIO.getCurrentFrame(), diff > 0 ? 1.1
-                                                        : 0.909090909);
-                                        DisplayIO.getCurrentFrame().refreshSize();
-                                        FrameKeyboardActions.Refresh();
+                                        double scaleFactor = diff > 0 ? 1.1 : 0.909090909;
+                                        zoomFrameTopLeftIfEnabled(DisplayIO.getCurrentFrame(), scaleFactor);
                                 }
                                 // MessageBay.displayMessage("Can not resize the frame name");

trunk/src/org/expeditee/settings/experimental/ExperimentalFeatures.java

@@ -25 +25 @@
         public static final BooleanSetting AutoWrap = new BooleanSetting("Enable auto wrapping of text", false);
         
+        public static final BooleanSetting FrameZoom = new BooleanSetting("Enable zooming in and out of frame using F1/F2 or else shift with click-wheel", false);
+        
+        public static final BooleanSetting FrameZoomAroundCursor = new BooleanSetting("If true, Frame Zooming uses the location of the mouse cursor as the central point to zoom in/out.", false);
+        
         public static final BooleanSetting MousePan = new BooleanSetting("Enable panning of the frame by shift-click and dragging the mouse", false);