Changeset 602

Timestamp:

12/11/13 11:13:21 (11 years ago)

Author:

jts21

Message:

Invert the behaviour of shift-delete (now the default is to delete a single item, and shift-delete deletes all the connected items too). Also update highlighting so connected items are highlighted in accordance with the deletion behaviour. Does not currently highlight items that are being carried (adding that would be as simple as disabling a few statements that explicitly disable highlighting on carried items, but it would look kind of ugly)

Location:

trunk/src/org/expeditee/gui

Files:

• Frame.java (modified) (1 diff)
• FrameGraphics.java (modified) (4 diffs)
• FrameMouseActions.java (modified) (4 diffs)
• FrameUtils.java (modified) (3 diffs)

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

@@ -960 +960 @@
                 if (bReparse) {
                         FrameUtils.Parse(this, false, false);
-                        FrameGraphics.requestRefresh(false);
                 } else {
                         notifyObservers(bRecalculate);
                 }
+                // always request a refresh otherwise filled shapes
+                // that were broken by a deletion and then reconnected by the undo
+                // don't get filled until the user otherwise causes them to redraw
+                FrameGraphics.requestRefresh(false);
                 FrameGraphics.Repaint();
                 ItemUtils.EnclosedCheck(_body);

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

@@ -22 +22 @@
 
 import org.expeditee.items.Circle;
+import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -27 +28 @@
 import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -740 +742 @@
                                 i = toDisconnect;
                         } else {
-                                Collection<Item> connected = i.getAllConnected();
-                                for (Item conn : connected) {
-                                        conn.setHighlightMode(Item.HighlightMode.Connected);
-                                }
+                                if(FrameMouseActions.isShiftDown()) {
+                                for(Item j : i.getAllConnected()) {
+                                        if(j instanceof Dot && !j.equals(i)) {
+                                                j.setHighlightMode(HighlightMode.Connected);
+                                        }
+                                }
+                        } else {
+                                for(Item j : i.getAllConnected()) {
+                                        if(j instanceof Dot && !j.equals(i)) {
+                                                j.setHighlightMode(HighlightMode.None);
+                                        }
+                                }
+                                l.getStartItem().setHighlightMode(HighlightMode.Connected);
+                                l.getEndItem().setHighlightMode(HighlightMode.Connected);
+                        }
+//                              Collection<Item> connected = i.getAllConnected();
+//                              for (Item conn : connected) {
+//                                      conn.setHighlightMode(Item.HighlightMode.Connected);
+//                              }
                         }
                 } else if (i instanceof Circle) {
@@ -749 +766 @@
                 } else if (!i.isVisible()) {
                         changeHighlightMode(i, Item.HighlightMode.Connected, null);
-                } else {
+                } else if (i instanceof Dot) {
+                        // highlight the dot
+                        if (i.hasPermission(UserAppliedPermission.full)) {
+                                changeHighlightMode(i, Item.HighlightMode.Normal, Item.HighlightMode.None);
+                        } else {
+                                changeHighlightMode(i, Item.HighlightMode.Connected, Item.HighlightMode.Connected);
+                        }
+                        // highlight connected dots, but only if there aren't items being carried on the cursor
+                        if(FreeItems.getInstance().size() == 0) {
+                        if(FrameMouseActions.isShiftDown()) {
+                                for(Item j : i.getAllConnected()) {
+                                        if(j instanceof Dot && !j.equals(i)) {
+                                                j.setHighlightMode(HighlightMode.Connected);
+                                        }
+                                }
+                        } else {
+                                for(Item j : i.getAllConnected()) {
+                                        if(j instanceof Dot && !j.equals(i)) {
+                                                j.setHighlightMode(HighlightMode.None);
+                                        }
+                                }
+                                for(Line l : i.getLines()) {
+                                        Item j = l.getOppositeEnd(i);
+                                        j.setHighlightMode(HighlightMode.Connected);
+                                }
+                        }
+                        }
+        } else {
                         // FrameGraphics.ChangeSelectionMode(i,
                         // Item.SelectedMode.Normal);

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

@@ -2421 +2421 @@
                                 _offY = getY() - anchored.getY() + anchored.getOffset().y;
                         } else {
-                                // delete the entire shape attached to the line, unless shift is pressed
-                                if(!isShiftDown()) {
+                                // delete the entire shape attached to the line, if shift is pressed
+                                if(isShiftDown()) {
                                 List<Item> tmp = new ArrayList<Item>(FreeItems.getInstance());
                                 for(Item i : tmp) {
@@ -2526 +2526 @@
                         Collection<Item> toUndo = null;
                         if (toDelete.isLineEnd()) {
-                                // delete the entire connected shape unless shift is down
-                                if(!isShiftDown()) {
+                                // delete the entire connected shape if shift is down
+                                if(isShiftDown()) {
                                         List<Item> tmp = new ArrayList<Item>();
                                         tmp.add(toDelete);
@@ -2542 +2542 @@
                                         toUndo = deleteLineEnd(toDelete);
                                 }
-                                // delete the entire connected shape unless we're hovering the end of the line, or shift is down
-                        } else if (toDelete instanceof Line
-                                        && toDelete.getHighlightMode() == Item.HighlightMode.Disconnect || isShiftDown()) {
+                                // delete the entire connected shape if shift is down, unless we're hovering the end of the line
+                        } else if (toDelete instanceof Line && !isShiftDown() ||
+                                        toDelete.getHighlightMode() == Item.HighlightMode.Disconnect) {
                                 Line line = (Line) toDelete;
                                 Item start = line.getStartItem();
@@ -3326 +3326 @@
         public static void shift(KeyEvent e) {
                 _shiftDown = e.isShiftDown();
+                getInstance().refreshHighlights();
         }
 }

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

@@ -42 +42 @@
 import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
@@ -1199 +1200 @@
                 List<InteractiveWidget> enclosedWidgets = new LinkedList<InteractiveWidget>();
                 for (Item i : enclosed) {
-                        // Dont want to loose the highlighting from the current item
-                        if (i != currentItem && !enclosure.contains(i))
-                                i.setHighlightMode(Item.HighlightMode.None);
+                        // Don't want to lose the highlighting from the current item
+                        if(i == currentItem || enclosure.contains(i)) {
+                                continue;
+                        }
+                        // Don't want to lose the highlighting of connected Dots
+                        if(i instanceof Dot && i.getHighlightMode() == HighlightMode.Connected) {
+                                for(Line l : i.getLines()) {
+                                        if(l.getOppositeEnd(i).getHighlightMode() == HighlightMode.Normal) {
+                                                continue;
+                                        }
+                                }
+                        }
                         if (i instanceof WidgetCorner) {
                                 if (!enclosedWidgets.contains(((WidgetCorner) i)
@@ -1207 +1217 @@
                                         enclosedWidgets.add(((WidgetCorner) i).getWidgetSource());
                         }
+                        i.setHighlightMode(Item.HighlightMode.None);
                 }