Changeset 1511

Timestamp:

02/19/20 10:44:38 (4 years ago)

Author:

bnemhaus

Message:

Frame::Parse has been updated to include a new boolean parameter. When true, widgets that are created as a result of the parse send not only notify the widget framework that they have been added, but are also visible. When false, they only notify they have been added.

The widget framework now distinguishes between added and visible widgets, this fixes a bug. Bug: when programmatically adding a widget to not the current frame, it never gets properly removed and therefore still catches click events from users. By distinguishing between adding and making visible this is avoided.

---

Another bug has been fixed. Bug: When setting a text item to have a right anchor, and then subsequently reducing the size of the window, this text item would get a width of zero assigned. This was caused by some issues with the logic of how right margins for items were calculated.

Location:

trunk/src/org/expeditee

Files:

• gio/gesture/StandardGestureActions.java (modified) (4 diffs)
• gui/Frame.java (modified) (2 diffs)
• gui/FrameUtils.java (modified) (11 diffs)
• items/Item.java (modified) (2 diffs)
• items/Text.java (modified) (4 diffs)
• items/widgets/SampleWidget1.java (modified) (1 diff)
• items/widgets/SampleWidget2.java (modified) (1 diff)
• items/widgets/SwingWidget.java (modified) (2 diffs)
• items/widgets/Widget.java (modified) (1 diff)

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

@@ -1208 +1208 @@
                 }
                 if (bReparse) {
-                        FrameUtils.Parse(currentFrame, false, false);
+                        FrameUtils.Parse(currentFrame, false, false, false);
                 } else {
                         currentFrame.notifyObservers(bRecalculate);
@@ -1933 +1933 @@
                 Frame currentFrame = DisplayController.getCurrentFrame();
                 if (bReparse) {
-                        FrameUtils.Parse(currentFrame, false, false);
+                        FrameUtils.Parse(currentFrame, false, false, false);
                 } else {
                         currentFrame.notifyObservers(bRecalculate);
@@ -2013 +2013 @@
                 itemList.clear();
                 if (bReparse) {
-                        FrameUtils.Parse(currentFrame, false, false);
+                        FrameUtils.Parse(currentFrame, false, false, false);
                         /*
                          * TODO check if I need to recalculate even if reparse occurs, here and in
@@ -3344 +3344 @@
                         }
                         if (toDelete.hasOverlay()) {
-                                FrameUtils.Parse(parent, false, false);
+                                FrameUtils.Parse(parent, false, false, false);
                                 DisplayController.requestRefresh(false);
                         }

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

@@ -1196 +1196 @@
                 
                 if (reparse) {
-                        FrameUtils.Parse(this, false, false);
+                        FrameUtils.Parse(this, false, false, false);
                 } else {
                         notifyObservers(recalculate);
@@ -1258 +1258 @@
                 
                 if (bReparse) {
-                        FrameUtils.Parse(this, false, false);
+                        FrameUtils.Parse(this, false, false, false);
                 } else {
                         notifyObservers(bRecalculate);

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

@@ -71 +71 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.Item.HighlightMode;
+import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.JSItem;
@@ -680 +681 @@
          * @param txt
          *            Text to create the widget from. Must not be null.
+         * @param userEdit True if createWidget is being called because a user has made a edit, false otherwise.
          * 
          * @return True if created/added. False if could not create.
@@ -685 +687 @@
          * @author Brook Novak
          */
-        private static boolean createWidget(Frame frame, Text txt, ItemsList list) {
+        private static boolean createWidget(Frame frame, Text txt, ItemsList list, boolean userEdit) {
 
                 if (frame == null) {
@@ -723 +725 @@
 
                 frame.addAllItems(iw.getItems(), list);
+                
+                if (userEdit) {
+                        iw.onParentStateChanged(new ItemParentStateChangedEvent(frame, ItemParentStateChangedEvent.EVENT_TYPE_SHOWN));
+                }
 
                 return true;
@@ -728 +734 @@
         
         private static boolean createWidgetInBody(Frame frame, Text txt) {
-                return createWidget(frame, txt, frame.getBody(false));
+                return createWidget(frame, txt, frame.getBody(false), false);
         }
 
@@ -889 +895 @@
         }
         
-        private static void transformOutOfPlaceItems(Frame toParse, ItemsList toTransform) {
+        private static void transformOutOfPlaceItems(Frame toParse, ItemsList toTransform, boolean sendWidgetVisible) {
                 // Get all items from toTransform that have not been marked as deleted.
                 List<Item> items = toParse.getItems(false, toTransform);
@@ -988 +994 @@
                                                         // Check for interactive widgets
                                                 } else if (ItemUtils.startsWithTag(i, ItemUtils.TAG_IWIDGET)) {
-                                                        createWidget(toParse, (Text) i, toTransform);
+                                                        createWidget(toParse, (Text) i, toTransform, sendWidgetVisible);
                                                 }
 
@@ -1149 +1155 @@
          */
         public static void Parse(Frame toParse, boolean firstParse) {
-                Parse(toParse, firstParse, false);
+                Parse(toParse, firstParse, false, false);
         }
 
@@ -1160 +1166 @@
          *            an ao tag linked to a frame with an frameImage of a frame which
          *            also has an ao tag on it.
+         * @param userEdit TODO
          */     
-        public static void Parse(Frame toParse, boolean firstParse, boolean ignoreAnnotations) { 
+        public static void Parse(Frame toParse, boolean firstParse, boolean ignoreAnnotations, boolean userEdit) { 
                 List<String> accessList = Label.getAccessibleLabelsNames(toParse.getPrimaryBody());
                 
@@ -1167 +1174 @@
                 ItemsList surrogates = toParse.getSurrogateBody();
                 
-                transformOutOfPlaceItems(toParse, primaries);
-                transformOutOfPlaceItems(toParse, surrogates);
+                transformOutOfPlaceItems(toParse, primaries, userEdit);
+                transformOutOfPlaceItems(toParse, surrogates, userEdit);
                 
                 toParse.getInteractableItems().clear();
@@ -1801 +1808 @@
                 if (!DisplayController.isXRayMode()) {
                         if (toReparse != null) {
-                                Parse(toReparse, false, false);
+                                Parse(toReparse, false, false, true);
                         } else {
                                 if (toRecalculate != null) {

trunk/src/org/expeditee/items/Item.java

@@ -2740 +2740 @@
         }
 
-        public void setRightMargin(int i, boolean fixWidth)
-        {
-                int newWidth = i - getX() - Item.MARGIN_LEFT;
-                if (newWidth < 0) newWidth = 0;
-                
-                if (!fixWidth) {
-                        newWidth *= -1;
-                }
-
-                setWidth(newWidth);
+        public void setRightMargin(int rightEdgeToFitTo, boolean fixWidth)
+        {
+                int itemXLeft = getX();
+                int adjustedRightEdgeToFitTo = rightEdgeToFitTo - Item.MARGIN_LEFT;
+                
+                if (itemXLeft < adjustedRightEdgeToFitTo) {
+                        int newWidth = adjustedRightEdgeToFitTo - itemXLeft;
+
+                        if (!fixWidth) {
+                                newWidth *= -1;
+                        }
+
+                        setWidth(newWidth);
+                } else if (fixWidth) {
+                        System.err.println(
+                                        "Item::setRightMargin() called to set right margin outside of writable area but with fixWidth set to true.");
+                        System.err.println(this);
+                }
         }
 
@@ -3655 +3663 @@
                 if (anchor != null) {
                         anchorConstraints();
-                        setX(DisplayController.getFramePaintArea().getMaxX() - anchor - getBoundsWidth());
+                        int width = Math.abs(getBoundsWidth());
+                        //System.err.println("Item::setAnchorRight::Text Content= " + getText() + "; width=" + width);
+                        setX(DisplayController.getFramePaintArea().getMaxX() - anchor - width);
                 }
                 

trunk/src/org/expeditee/items/Text.java

@@ -393 +393 @@
         @Override
         public void setWidth(Integer width) {
+                System.err.println("Text::setWidth::Text content=" + getText() + ", new width=" + width);
                 invalidateAll();
 
@@ -400 +401 @@
                         return;
                 }
-
+                
+                if (width == 0) {
+                        System.err.println("Width of Zero: " + getText());
+                }
+                
                 _width = width;
                 rebuild(true);
@@ -1783 +1788 @@
 
                 if (this.getMinWidth() != null && getTextLayouts().size() == 0 && this.getFont() != null) {
+                        // could use any text, 'p' is used simply to get some text in correct font.
                         getTextLayouts().add(TextLayout.getManager().layoutStringSimple("p", this.getFont()));
                         isFakeLayout = true;
@@ -2910 +2916 @@
                         if (anchor != null) {
                                 setX(DisplayController.getFramePaintAreaWidth() - anchor - getBoundsWidth() + getLeftMargin());
+                                //System.err.println("Text::setAnchorRight::boundsWidth=" + getBoundsWidth());
                         }
                         return;

trunk/src/org/expeditee/items/widgets/SampleWidget1.java

@@ -50 +50 @@
                         c.setFocusable(true);
                 }
+                System.err.println("SampleWidget1::setting light weight popup enabled to false.");
+                cmboOptions.setLightWeightPopupEnabled(false);
         }
                 

trunk/src/org/expeditee/items/widgets/SampleWidget2.java

@@ -74 +74 @@
                 cmboPrepend.setFont(BIG_FONT);
                 cmboPrepend.addActionListener(new PrependManager(cmboPrepend, utxt));
+                cmboPrepend.setLightWeightPopupEnabled(false);
                 
                 controls.add(lblTitle);

trunk/src/org/expeditee/items/widgets/SwingWidget.java

@@ -15 +15 @@
 
 import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
 
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
@@ -52 +51 @@
                 onBoundsChanged();
                 
-                JPopupMenu.setDefaultLightWeightPopupEnabled(false);
+                System.err.println("SwingWidget::Suppressed static setDefaultLightWeightPopupEnabled to false.");
+                //JPopupMenu.setDefaultLightWeightPopupEnabled(false);
         }
 

trunk/src/org/expeditee/items/widgets/Widget.java

@@ -1113 +1113 @@
                         case ItemParentStateChangedEvent.EVENT_TYPE_ADDED:
                         case ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY:
+                                System.err.println("Widget::onParentStateChanged: Added but not yet shown widget.");
+                                break;
                         case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN:
                         case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY:
+                                System.err.println("Widget::onParentStateChanged: Shown widget.");
                                 EcosystemManager.addInteractiveWidget(this);
                                 addWidgetContent(e);