Changeset 850

Timestamp:

02/05/14 17:03:30 (10 years ago)

Author:

jts21

Message:

Enable F1/F2 or shift-scroll on background to zoom whole frame, and hopefully fix broken shift-scroll zooming on Windows

Location:

trunk/src/org/expeditee/gui

Files:

• FrameKeyboardActions.java (modified) (2 diffs)
• FrameMouseActions.java (modified) (1 diff)

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

@@ -1043 +1043 @@
                                 break;
                         case SizeDown:
-                                if (isControlDown) {
-                                        UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() - 0.05f);
-                                        Misc.repaint();
-                                        return;
-                                }
+                                ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), 0.909090909f);
+                                DisplayIO.getCurrentFrame().refreshSize();
+                                FrameKeyboardActions.Refresh();
+                                return;
+//                              if (isControlDown) {
+//                                      UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() - 0.05f);
+//                                      Misc.repaint();
+//                                      return;
+//                              }
                         case SizeUp:
-                                if (isControlDown) {
-                                        UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() + 0.05f);
-                                        Misc.repaint();
-                                        return;
-                                }
+                                ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), 1.1f);
+                                DisplayIO.getCurrentFrame().refreshSize();
+                                FrameKeyboardActions.Refresh();
+                                return;
+//                              if (isControlDown) {
+//                                      UserSettings.ScaleFactor.set(UserSettings.ScaleFactor.get() + 0.05f);
+//                                      Misc.repaint();
+//                                      return;
+//                              }
                         default:
                                 MessageBay.displayMessageOnce(displayMessage);
@@ -1608 +1616 @@
                         if (item.isFrameName()) {
                                 // scale the entire frame
-                                ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), (float) (diff > 0 ? 1.1 : 0.909090909));
-                                DisplayIO.getCurrentFrame().refreshSize();
-                                FrameKeyboardActions.Refresh();
+                                if(diff != 0) {
+                                        ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), (float) (diff > 0 ? 1.1 : 0.909090909));
+                                        DisplayIO.getCurrentFrame().refreshSize();
+                                        FrameKeyboardActions.Refresh();
+                                }
                                 // MessageBay.displayMessage("Can not resize the frame name");
                                 return;

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

@@ -3298 +3298 @@
                         }
 
-                        Item ip = FrameUtils.getCurrentItem();
-                        if (ip != null && clicks > 1) {
-                                float size = ip.getSize();
-                                if (ip instanceof Dot || ip instanceof Line
-                                                || ip instanceof Circle) {
-                                        size = ip.getThickness();
-                                }
-                                // base the number of clicks on the size of the object
-                                clicks = (int) Math.ceil(size / 20.0 * clicks);
-                        }
-                        FrameKeyboardActions.functionKey(rotationType, clicks, arg0
+                        FrameKeyboardActions.functionKey(rotationType, 1, arg0
                                         .isShiftDown(), arg0.isControlDown());