Changeset 1379

Timestamp:

05/27/19 11:38:10 (5 years ago)

Author:

bln4

Message:

Reimplementation of the functionality that limits a text item to one line by reducing font size. The user must now specify inject a width property (eg Width: 300) and inject the property 'SingleLineOnly: true' to cause the functionality to happen. This new version of the functionality also now works with pasting large amounts of content rather than adding a single character at the time. Also, this new version dynamically returns to the larger font size as the length of the text item decreases.

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/Text.java (modified) (4 diffs)

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

@@ -322 +322 @@
                         _Attrib.put("Placeholder",                      Text.class.getMethod("getPlaceholder"), 
                                                                                                 Text.class.getMethod("setPlaceholder", pString));
+                        _Attrib.put("SingleLineOnly",           Text.class.getMethod("isSingleLineOnly"), 
+                                                                                                Text.class.getMethod("setSingleLineOnly", pBool));
                         
                         // Aliases for attribute setting

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

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

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

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

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

@@ -139 +139 @@
 
         private Integer _minWidth = -Integer.MAX_VALUE;
+        
+        private boolean _singleLine = false;
         
         private Justification _justification = Justification.left;
@@ -1817 +1819 @@
                 Font paintFont = getPaintFont();
                 if (this._text != null && this._text.length() > 0) {
-                        this._textLayouts = 
+                        List<TextLayout> proposedTextLayout = 
                                         EcosystemManager.getTextLayoutManager().layoutString(
                                                 _text.toString(), 
@@ -1827 +1829 @@
                                                 getJustification() == Justification.full
                                         );
+                        if (proposedTextLayout.size() > 1 && isSingleLineOnly()) {
+                                paintFont = paintFont.clone();
+                                
+                                while(proposedTextLayout.size() > 1) {
+                                        paintFont.setSize(paintFont.getSize() - 1);
+                                        proposedTextLayout = 
+                                                EcosystemManager.getTextLayoutManager().layoutString(
+                                                        _text.toString(), 
+                                                        paintFont,
+                                                        new Point(getX(), getY()), lines != null ? lines.toArray(new org.expeditee.core.Line[1]) : null,
+                                                        (int) width, 
+                                                        (int) getSpacing(), 
+                                                        true, 
+                                                        getJustification() == Justification.full
+                                                );
+                                }
+                        }
+                        this._textLayouts = proposedTextLayout;
                         
                         if (this.getMask() != null) {
@@ -3154 +3174 @@
                 }
         }
+
+        public boolean isSingleLineOnly() {
+                return _singleLine;
+        }
+
+        public void setSingleLineOnly(boolean _singleLine) {
+                this._singleLine = _singleLine;
+        }
 }