Changeset 1548 for trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

Timestamp:

01/26/21 09:45:54 (3 years ago)

Author:

bnemhaus

Message:

With a Item under your cursor, pressing left and right mouse buttons at the same time, extracts the properties of that item. (No change)
However, if an Item is attached to the users cursor when doing this, nothing happens. Now, instead of nothing happening, all attached Items are checked to see if they are in the format of "Property:". If they are then those specified properties are extracted.

File:

• trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java (modified) (2 diffs)

trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

@@ -4716 +4716 @@
          * attributes, so it is not checked.
          * 
+         * 25/01/2021: If the user has Items attached to the cursor, they are used to 
+         * specify what attributes to extract.  For example, if the user has "Width:"
+         * attached to their cursor, only the width attribute will be extracted rather
+         * than all of them.
+         * 
          * @param toExtract
          *            Item containing the Item to extract the attributes from.
@@ -4723 +4728 @@
                         return;
                 }
-
-                if (FreeItems.hasItemsAttachedToCursor()) {
-                        return;
-                }
-
+                
                 Item attribs;
                 Item item = toExtract;
+                Object toExtractFrom = item.isFrameName() ? item.getParent() : item; 
+
                 // Extract the frames attributes when the user clicks on the frame name
                 FrameGraphics.changeHighlightMode(item, HighlightMode.None);
                 if (item.isFrameName()) {
-                        attribs = AttributeUtils.extractAttributes(item.getParent());
+                        attribs = AttributeUtils.extractAttributes(toExtractFrom);
                 } else {
-                        attribs = AttributeUtils.extractAttributes(item);
+                        attribs = AttributeUtils.extractAttributes(toExtractFrom);
+                }
+                
+                if (FreeItems.hasItemsAttachedToCursor()) {
+                        return;
                 }