Changeset 923

Timestamp:

09/26/14 15:45:34 (10 years ago)

Author:

jts21

Message:

Justify text items on delete and undo/redo

Location:

trunk/src/org/expeditee/gui

Files:

• Frame.java (modified) (2 diffs)
• FrameMouseActions.java (modified) (3 diffs)

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

@@ -1002 +1002 @@
                 FrameGraphics.requestRefresh(false);
                 FrameGraphics.Repaint();
-                ItemUtils.EnclosedCheck(_body);
+                // ItemUtils.EnclosedCheck(_body);
+                ItemUtils.Justify(this);
         }
         
@@ -1056 +1057 @@
                 FrameGraphics.requestRefresh(false);
                 FrameGraphics.Repaint();
-                ItemUtils.EnclosedCheck(_body);
+                // ItemUtils.EnclosedCheck(_body);
+                ItemUtils.Justify(this);
         }
 

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

@@ -2717 +2717 @@
                         updateCursor();
                         if (parent != null)
-                                ItemUtils.EnclosedCheck(parent.getItems());
+                                // ItemUtils.EnclosedCheck(parent.getItems());
+                                ItemUtils.Justify(parent);
                         if (toDelete.hasOverlay()) {
                                 FrameUtils.Parse(parent, false, false);
@@ -2792 +2793 @@
                 for (Frame f : modifiedFrames) {
                         f.removeAllItems(itemList);
-                        ItemUtils.EnclosedCheck(f.getItems());
+                        // ItemUtils.EnclosedCheck(f.getItems());
+                        ItemUtils.Justify(f);
                 }
                 // TODO: How should undelete deal with undo when items are removed from
@@ -3267 +3269 @@
                 // Check enclosure for all the frames of the items that were anchored
                 for (Frame f : checkEnclosure) {
-                        ItemUtils.EnclosedCheck(f.getItems());
-                }
-                
-                // justify text items now
-                ItemUtils.Justify(toAnchorCopy);
+                        // ItemUtils.EnclosedCheck(f.getItems());
+                        ItemUtils.Justify(f);
+                }
 
                 Frame currentFrame = DisplayIO.getCurrentFrame();