Changeset 1369 for trunk/src/org/expeditee/items/Text.java

Timestamp:

05/23/19 12:20:07 (5 years ago)

Author:

bln4

Message:

MaxWidth on text items is now a thing. Use this on text boxes in authentication frameset.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (11 diffs)

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

@@ -136 +136 @@
          * the user. Initially set to be as wide as possible.
          */
+        private Integer _width = -Integer.MAX_VALUE;
+
+        private Integer _minWidth = -Integer.MAX_VALUE;
+        
         private Integer _maxWidth = -Integer.MAX_VALUE;
-
-        private Integer _minWidth = -Integer.MAX_VALUE;
 
         private Justification _justification = Justification.left;
@@ -186 +188 @@
         // 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.
@@ -395 +399 @@
                 }
 
-                _maxWidth = width;
+                _width = width;
                 rebuild(true);
                 invalidateAll();
@@ -414 +418 @@
                 invalidateAll();
         }
+        
+        public void setMaxWidth(Integer width) {
+                invalidateAll();
+
+                if (width == null) {
+                        setJustification(Justification.left);
+                        setRightMargin(DisplayController.getFramePaintAreaWidth(), false);
+                        return;
+                }
+                
+                _maxWidth = width;
+                rebuild(true);
+                invalidateAll();
+        }
+        
 
         /**
@@ -428 +447 @@
         @Override
         public Integer getWidth() {
-                if (_maxWidth == null || _maxWidth <= 0) {
+                if (_width == null || _width <= 0) {
                         return null;
                 }
 
-                return _maxWidth;
+                return _width;
         }
 
         public Integer getAbsoluteWidth() {
-                if (_maxWidth == null) {
+                if (_width == null) {
                         return Integer.MAX_VALUE;
                 }
 
-                return Math.abs(_maxWidth);
+                return Math.abs(_width);
         }
 
@@ -449 +468 @@
                 return _minWidth;
         }
+        
+        public Integer getMaxWidth() {
+                if (_maxWidth == null || _maxWidth <= 0) {
+                        return null;
+                }
+                return _maxWidth;
+        }
 
         public Integer getAbsoluteMinWidth() {
@@ -456 +482 @@
                 return Math.abs(_minWidth);
         }
-
+        
+        public Integer getAbsoluteMaxWidth() {
+                if (_maxWidth == null) {
+                        return Integer.MIN_VALUE;
+                }
+                return Math.abs(_maxWidth);
+        }
+        
         @Override
         public Colour getHighlightColor() {
@@ -1300 +1333 @@
          */
         public Font getPaintFont() {
-                final Font f = getFont();
+                Font f = getFont();
                 if (f == null) {
                         _font = EcosystemManager.getFontManager().getDefaultFont().clone();
-                        return _font;
+                        f = _font;
+                        
+                        if (_useSubstituteFont) {
+                                f = _substituteFont;
+                        }
                 }
                 return f;
@@ -1693 +1730 @@
 
                         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));
@@ -1808 +1853 @@
                 float width = Float.MAX_VALUE;
                 if (limitWidth) {
-                        if (_maxWidth == null) {
+                        if (_width == null) {
                                 width = DisplayController.getFramePaintAreaWidth() - getX();
                         } else {
@@ -1889 +1934 @@
 
         private boolean hasFixedWidth() {
-                assert (_maxWidth != null);
-                if (_maxWidth == null) {
+                assert (_width != null);
+                if (_width == null) {
                         justify(false);
                 }
-                return _maxWidth > 0;
+                return _width > 0;
         }