Changeset 602 for trunk/src/org/expeditee/gui/FrameGraphics.java

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)

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (4 diffs)

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);