Changeset 580

Timestamp:

12/06/13 14:08:52 (11 years ago)

Author:

jts21

Message:

Add functionality to ignore items when a mouse button is pressed if shift is down:

• rectangles and arrows can be created on top of existing items by holding shift when clicking
• deleting shapes will ignore enclosed shapes if shift is down
• deleting a Dot now deletes the entire shape by default
• deleting Dots/Lines will ignore other Dots/Lines connected by more than 1 join if shift is down

File:

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

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

@@ -1009 +1009 @@
                                 return;
                         }
-                        // otherwise if the user is pointing at something,pick it up
-                } else if (clicked != null) {
+                        // otherwise if the user is pointing at something, pick it up unless shift is down
+                } else if (clicked != null && !isShiftDown) {
+                        
                         // check permissions
                         if (!clicked.hasPermission(UserAppliedPermission.full)) {
@@ -1099 +1100 @@
                                 pickup(clicked);
                         }
-                        // otherwise create a line
-                } else if (clickedIn != null) {
+                        // if we're inside a shape, pick it up unless shift is down
+                } else if (clickedIn != null && !isShiftDown) {
                         ArrayList<Item> toPickup = new ArrayList<Item>(clickedIn.size());
                         for (Item ip : clickedIn)
@@ -1424 +1425 @@
                         }
                 } else {
-                        // if the user is pointing at something, this is a copy
-                        if (clicked != null) {
+                        // if the user is pointing at something and shift isn't down, make a copy
+                        if (clicked != null && !isShiftDown()) {
                                 // check permissions
                                 if (clicked.isLineEnd()) {
@@ -1472 +1473 @@
                                 pickup(copies);
                         } else {
-                                // if user is pointing in a closed shape, copy the items inside
-                                if (clickedIn != null) {
+                                // if user is pointing in a closed shape and shift isn't down, make a copy of the items inside
+                                if (clickedIn != null && !isShiftDown()) {
                                         // Set the selection mode for the items that were clicked in
                                         Collection<Item> enclosed = getFullyEnclosedItems(clickedIn);
@@ -2411 +2412 @@
                                 _offY = getY() - anchored.getY() + anchored.getOffset().y;
                         } else {
+                                // delete the entire shape attached to the line, unless shift is pressed
+                                if(!isShiftDown()) {
+                                List<Item> tmp = new ArrayList<Item>(FreeItems.getInstance());
+                                for(Item i : tmp) {
+                                        // remove entire rectangles instead of just the corner
+                                        if(i instanceof Dot) {
+                                                FreeItems.getInstance().addAll(i.getAllConnected());
+                                                for(Item j : i.getAllConnected()) {
+                                                        if(j instanceof Dot) {
+                                                                FreeItems.getInstance().addAll(j.getLines());
+                                                        }
+                                                }
+                                        }
+                                }
+                                }
                                 deleteItems(FreeItems.getInstance());
                         }
@@ -2417 +2433 @@
                         // the user is not pointing at an item
                 } else if (toDelete == null) {
-
-                        // if the user is pointing inside a closed shape, delete all
-                        // items inside it
-                        Collection<Item> items = FrameUtils.getCurrentItems(null);
-
+                
+                        // if the user is pointing inside a closed shape, delete it
+                        
+                        Collection<Item> items = null;
+                        // if shift is down, only delete the enclosing shape (ignore the items inside)
+                        if(isShiftDown()) {
+                                Collection<Item> tmp = FrameUtils.getEnclosingLineEnds();
+                                if(tmp != null) {
+                                        items = new ArrayList<Item>();
+                                        items.addAll(tmp);
+                                for(Item i : tmp) {
+                                        if(i instanceof Dot) {
+                                                items.addAll(((Dot)i).getLines());
+                                        }
+                                }
+                                }
+                        } else {
+                                items = FrameUtils.getCurrentItems(null);
+                        }
+                        
                         if (items != null) {
                                 Collection<Item> toRemove = new LinkedHashSet<Item>(items
@@ -2486 +2517 @@
                         Collection<Item> toUndo = null;
                         if (toDelete.isLineEnd()) {
-                                toUndo = deleteLineEnd(toDelete);
+                                // delete the entire connected shape unless shift is down
+                                if(!isShiftDown()) {
+                                        List<Item> tmp = new ArrayList<Item>();
+                                        tmp.add(toDelete);
+                                        // remove entire shape instead of just the corner
+                                        tmp.addAll(toDelete.getAllConnected());
+                                        for(Item j : toDelete.getAllConnected()) {
+                                                if(j instanceof Dot) {
+                                                        tmp.addAll(j.getLines());
+                                                }
+                                        }
+                                        deleteItems(tmp);
+                                        return;
+                                } else {
+                                        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) {
+                                        && toDelete.getHighlightMode() == Item.HighlightMode.Disconnect || isShiftDown()) {
                                 Line line = (Line) toDelete;
                                 Item start = line.getStartItem();