Changeset 920 for trunk/src/org/expeditee/items

Timestamp:

09/01/14 17:58:47 (10 years ago)

Author:

jts21

Message:

Text items are now correctly justfied on Frame load, and when picked up or placed down inside a polygon

Location:

trunk/src/org/expeditee/items

Files:

• ItemUtils.java (modified) (2 diffs)
• Text.java (modified) (3 diffs)

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

@@ -36 +36 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.Vector;
@@ -1032 +1033 @@
                 return iWidgets;
         }
+        
+        public static void Justify(Collection<Item> items) {
+                for (Item i : items) {
+                        if (i instanceof Text) {
+                                Collection<Item> enclosure = FrameUtils.getEnclosingLineEnds(i.getPosition());
+                                if (enclosure != null) {
+                                        ((Text)i).justify(false, enclosure.iterator().next().getEnclosedShape());
+                                }
+                        }
+                }
+        }
+        
+        public static void Justify(Frame frame) {
+                EnclosedCheck(frame.getItems());
+                Justify(frame.getItems());
+        }
 }

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

@@ -2269 +2269 @@
                 }
         }
-
-        public void justify(boolean fixWidth) {
-                
+        
+        public void justify(boolean fixWidth, Polygon enclosure) {
                 // if autowrap is on, wrapping is done every time we draw
                 if(ExperimentalFeatures.AutoWrap.get()) {
@@ -2281 +2280 @@
                 // Check if that text item is inside an enclosing rectangle...
                 // Set its max width accordingly
-                Polygon enclosure = FrameUtils.getEnlosingPolygon();
                 if (enclosure != null) {
                         Rectangle bounds = enclosure.getBounds();
@@ -2306 +2304 @@
 
                 }
+        }
+
+        public void justify(boolean fixWidth) {
+                // if autowrap is on, wrapping is done every time we draw
+                if(ExperimentalFeatures.AutoWrap.get()) {
+                        return;
+                }
+                this.justify(fixWidth, FrameUtils.getEnlosingPolygon());
         }