Changeset 851

Timestamp:

02/05/14 17:11:59 (10 years ago)

Author:

jts21

Message:

Zoom frame around the current mouse position

Location:

trunk/src/org/expeditee

Files:

• gui/FrameKeyboardActions.java (modified) (4 diffs)
• items/Item.java (modified) (1 diff)

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

@@ -1043 +1043 @@
                                 break;
                         case SizeDown:
-                                ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), 0.909090909f);
+                                zoomFrame(DisplayIO.getCurrentFrame(), 0.909090909f);
                                 DisplayIO.getCurrentFrame().refreshSize();
                                 FrameKeyboardActions.Refresh();
@@ -1053 +1053 @@
 //                              }
                         case SizeUp:
-                                ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), 1.1f);
+                                zoomFrame(DisplayIO.getCurrentFrame(), 1.1f);
                                 DisplayIO.getCurrentFrame().refreshSize();
                                 FrameKeyboardActions.Refresh();
@@ -1583 +1583 @@
                 return bReparse;
         }
+        
+        private static void zoomFrame(Frame frame, double scaleFactor) {
+                
+                int x = FrameMouseActions.getX(), y = FrameMouseActions.getY();
+                
+                if (frame == null) {
+                        return;
+                }
+                
+                Collection<Item> items = frame.getVisibleItems();
+                
+                for(Item item : items) {
+                        if(item instanceof Text && item.getSize() <= Text.MINIMUM_FONT_SIZE && scaleFactor < 1) {
+                                return;
+                        }
+                }
+                
+                for (Vector v : frame.getVectors()) {
+                        v.Source.scale((float) scaleFactor, x, y);
+                }
+                
+                for (Item item : items) {
+                        // This line is only needed for circles!!
+                        // Need to really fix up the way this works!!
+                        if (item.hasEnclosures())
+                                continue;
+                        if (!item.hasPermission(UserAppliedPermission.full))
+                                continue;
+                        item.invalidateAll();
+                        if (!(item instanceof Line)) {
+                                item.scale((float) scaleFactor, x, y);
+                        }
+                }
+
+                for (Item item : items) {
+                        if (!item.hasPermission(UserAppliedPermission.full))
+                                continue;
+                        // if (!(item instanceof Line))
+                        item.updatePolygon();
+
+                        if (item instanceof Line) {
+                                ((Line) item).refreshStroke(item.getThickness());
+                        }
+
+                        item.invalidateAll();
+                }
+        }
 
         /**
@@ -1617 +1664 @@
                                 // scale the entire frame
                                 if(diff != 0) {
-                                        ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), (float) (diff > 0 ? 1.1 : 0.909090909));
+                                        zoomFrame(DisplayIO.getCurrentFrame(), diff > 0 ? 1.1 : 0.909090909);
                                         DisplayIO.getCurrentFrame().refreshSize();
                                         FrameKeyboardActions.Refresh();

trunk/src/org/expeditee/items/Item.java

@@ -3123 +3123 @@
 
         public void scale(Float scale, int originX, int originY) {
-                setXY(getX() * scale + originX, getY() * scale + originY);
+                setXY((getX() - originX) * scale + originX, (getY() - originY) * scale + originY);
                 setArrowheadLength(getArrowheadLength() * scale);