Changeset 1511 for trunk/src/org/expeditee/items/Item.java

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.

File:

• trunk/src/org/expeditee/items/Item.java (modified) (2 diffs)

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