Changeset 1377

Timestamp:

05/27/19 10:17:12 (5 years ago)

Author:

bln4

Message:

Rollback implementation of _maxWidth. After talks with David, this functionality is to be implemented slightly differently.

Location:

trunk/src/org/expeditee

Files:

• gui/AttributeUtils.java (modified) (1 diff)
• io/DefaultFrameReader.java (modified) (1 diff)
• io/DefaultFrameWriter.java (modified) (1 diff)
• items/Item.java (modified) (2 diffs)
• items/Text.java (modified) (7 diffs)

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

@@ -294 +294 @@
                         _Attrib.put("MinWidth",                         Item.class.getMethod("getMinWidthToSave"), 
                                                                                                 Item.class.getMethod("setMinWidth", pIntO));
-                        _Attrib.put("MaxWidth",                         Item.class.getMethod("getMaxWidthToSave"), 
-                                                                                                Item.class.getMethod("setMaxWidth", pIntO));
                         _Attrib.put("X",                    null,
                                                             Item.class.getMethod("setX", pFloat));

trunk/src/org/expeditee/io/DefaultFrameReader.java

@@ -181 +181 @@
                         
                         _ItemTagsExt.put("_ph", Text.class.getMethod("setPlaceholder", pString));
-                        _ItemTagsExt.put("_maxW", Text.class.getMethod("setMaxWidth", pIntO));
                 } catch (Exception e) {
                         e.printStackTrace();

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -155 +155 @@
                         
                         _ItemTagsExt.put("_ph", Text.class.getMethod("getPlaceholder"));
-                        _ItemTagsExt.put("_maxW", Text.class.getMethod("getMaxWidthToSave"));
                 } catch (Exception e) {
                         e.printStackTrace();

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

@@ -1170 +1170 @@
                 return getMinWidth();
         }
-        
-        public Integer getMaxWidthToSave() {
-                return getMaxWidth();
-        }
 
         public Integer getWidth()
@@ -1181 +1177 @@
         
         public Integer getMinWidth() {
-                return null;
-        }
-        
-        public Integer getMaxWidth() {
                 return null;
         }

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

@@ -140 +140 @@
         private Integer _minWidth = -Integer.MAX_VALUE;
         
-        private Integer _maxWidth = -Integer.MAX_VALUE;
-
         private Justification _justification = Justification.left;
 
@@ -188 +186 @@
         // The font to display this text in
         private Font _font;
-        private Font _substituteFont;
-        private boolean _useSubstituteFont = false;
 
         // The optional mask character to us in place of the text's content.
@@ -418 +414 @@
                 invalidateAll();
         }
-        
-        public void setMaxWidth(Integer width) {
-                invalidateAll();
-
-                if (width == null) {
-                        setJustification(Justification.left);
-                        setRightMargin(DisplayController.getFramePaintAreaWidth(), false);
-                        return;
-                }
-                
-                _maxWidth = width;
-                rebuild(true);
-                invalidateAll();
-        }
-        
 
         /**
@@ -468 +449 @@
                 return _minWidth;
         }
-        
-        public Integer getMaxWidth() {
-                if (_maxWidth == null || _maxWidth <= 0) {
-                        return null;
-                }
-                return _maxWidth;
-        }
 
         public Integer getAbsoluteMinWidth() {
@@ -481 +455 @@
                 }
                 return Math.abs(_minWidth);
-        }
-        
-        public Integer getAbsoluteMaxWidth() {
-                if (_maxWidth == null) {
-                        return Integer.MIN_VALUE;
-                }
-                return Math.abs(_maxWidth);
         }
         
@@ -1337 +1304 @@
                         _font = EcosystemManager.getFontManager().getDefaultFont().clone();
                         f = _font;
-                        
-                        if (_useSubstituteFont) {
-                                f = _substituteFont;
-                        }
                 }
                 return f;
@@ -1730 +1693 @@
 
                         int minWidth = getAbsoluteMinWidth();
-                        int maxWidth = getAbsoluteMaxWidth();
 
                         minX = Math.min(minX, bounds.getMinX());
                         maxX = minWidth < Integer.MAX_VALUE ? Math.max(minX + minWidth, bounds.getMaxX())
                                         : Math.max(maxX, bounds.getMaxX());
-                        if ((maxWidth - minX) < maxX) {
-                                this._useSubstituteFont = true;
-                                this._substituteFont.setSize(this._substituteFont.getSize() - 1);
-                        } else {
-                                this._useSubstituteFont = false;
-                                this._substituteFont = this._font;
-                        }
                         minY = Math.min(minY, (int) (bounds.getMinY() + y));
                         maxY = Math.max(maxY, (int) (bounds.getMaxY() + y));