Changeset 604

Timestamp:

12/11/13 14:56:52 (11 years ago)

Author:

jts21

Message:

Fix bug with deleting widget edges (they were being treated as lines and not being deleted properly)

File:

• trunk/src/org/expeditee/gui/FrameMouseActions.java (modified) (2 diffs)

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

@@ -2543 +2543 @@
                                 }
                                 // delete the entire connected shape if shift is down, unless we're hovering the end of the line
+                        } else if (toDelete instanceof WidgetEdge) { // must notify
+                                // widgets that they
+                                // are being deleted
+                                ((WidgetEdge) toDelete).getWidgetSource().onDelete();
+                                toUndo = toDelete.getConnected();
                         } else if (toDelete instanceof Line && !isShiftDown() ||
                                         toDelete.getHighlightMode() == Item.HighlightMode.Disconnect) {
@@ -2561 +2566 @@
                                 }
                                 toUndo = delete;
-                        } else if (toDelete instanceof WidgetEdge) { // must notify
-                                // widgets that they
-                                // are being deleted
-                                ((WidgetEdge) toDelete).getWidgetSource().onDelete();
-                                toUndo = toDelete.getConnected();
                         } else {
                                 bRecalculate |= toDelete.recalculateWhenChanged();