Changeset 1296 for trunk

Timestamp:

04/08/19 15:59:17 (5 years ago)

Author:

bln4

Message:

Added placeholders as a thing for text items. You can now provide default text for a text item. Inject the property 'Placeholder: <text>' were <text> is the placeholder text. When the placeholder is being used, the font color alpha is reduced.

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) (7 diffs)

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

@@ -315 +315 @@
                         _Attrib.put("Mask",                             Text.class.getMethod("getMask"), 
                                                                                                 Text.class.getMethod("setMask", pIntO));
+                        _Attrib.put("Placeholder",                      Text.class.getMethod("getPlaceholder"), 
+                                                                                                Text.class.getMethod("setPlaceholder", pString));
                         
                         // Aliases for attribute setting

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

@@ -161 +161 @@
                         _ItemTags.put('O', Text.class.getMethod("setMask", pIntO));
                         
+                        _ItemTags.put('=', Text.class.getMethod("setPlaceholder", pString));
+                        
                         // Lines and constraints are created differently
                         _ItemTags.put('L', Line.class.getMethod("setStartItem", pItem));

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

@@ -149 +149 @@
                         _ItemTags.put('^', Item.class.getMethod("getMagnetizedItemTop"));
                         _ItemTags.put('_', Item.class.getMethod("getMagnetizedItemBottom"));
+                        
+                        _ItemTags.put('=', Text.class.getMethod("getPlaceholder"));
                 } catch (Exception e) {
                         e.printStackTrace();

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

@@ -176 +176 @@
         // text is broken up into lines
         protected StringBuffer _text = new StringBuffer();
+        
+        // place holder text to use if _text is empty.
+        protected StringBuffer _placeholder = new StringBuffer();
 
         private List<TextLayout> _textLayouts = new LinkedList<TextLayout>();
         private List<TextLayout> _maskTextLayouts = new LinkedList<TextLayout>();
+        private List<TextLayout> _placeholderTextLayouts = new LinkedList<TextLayout>();
 
         // The font to display this text in
@@ -1753 +1757 @@
 
                 // if there is no text, there is nothing to do
-                if (_text == null || _text.length() == 0) {
+                if ((_text == null || _text.length() == 0 ) && getPlaceholder() == null) {
                         // Frame parent = getParent();
                         // if(parent != null)
@@ -1767 +1771 @@
                 if (_maskTextLayouts != null) {
                         _maskTextLayouts.clear();
+                }
+                EcosystemManager.getTextLayoutManager().releaseLayouts(_placeholderTextLayouts);
+                if (_placeholderTextLayouts != null) {
+                        _placeholderTextLayouts.clear();
                 }
 
@@ -1807 +1815 @@
                 }
 
-                this._textLayouts = 
-                        EcosystemManager.getTextLayoutManager().layoutString(
-                                _text.toString(), 
-                                getPaintFont(),
-                                new Point(getX(), getY()), lines != null ? lines.toArray(new org.expeditee.core.Line[1]) : null,
-                                (int) width, 
-                                (int) getSpacing(), 
-                                true, 
-                                getJustification() == Justification.full
-                        );
-                if (this.getMask() != null) {
-                        final Stream<Character> maskStream = _text.toString().chars().mapToObj(c -> (char) this.getMask().intValue());
-                        final StringBuilder sb = new StringBuilder();
-                        maskStream.forEach(c -> sb.append(c));
-                        this._maskTextLayouts =
-                                EcosystemManager.getTextLayoutManager().layoutString(
-                                        sb.toString(), 
-                                        getPaintFont(), 
-                                        new Point(getX(), getY()), lines != null ? lines.toArray(new org.expeditee.core.Line[1]) : null, 
-                                        (int) width, 
-                                        (int) getSpacing(), 
-                                        true, 
-                                        getJustification() == Justification.full
-                                );
-                }
-
+                Font paintFont = getPaintFont();
+                if (this._text != null && this._text.length() > 0) {
+                        this._textLayouts = 
+                                        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
+                                        );
+                        
+                        if (this.getMask() != null) {
+                                final Stream<Character> maskStream = _text.toString().chars().mapToObj(c -> (char) this.getMask().intValue());
+                                final StringBuilder sb = new StringBuilder();
+                                maskStream.forEach(c -> sb.append(c));
+                                this._maskTextLayouts =
+                                        EcosystemManager.getTextLayoutManager().layoutString(
+                                                sb.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
+                                        );
+                        }
+                }
+                if (this.getPlaceholder() != null) {
+                        this._placeholderTextLayouts =
+                                        EcosystemManager.getTextLayoutManager().layoutString(
+                                                getPlaceholder(), 
+                                                paintFont, 
+                                                new Point(getX(), getY()), lines != null ? lines.toArray(new org.expeditee.core.Line[1]) : null,
+                                                (int) width, 
+                                                (int) getSpacing(), 
+                                                true, 
+                                                getJustification() == Justification.full
+                                        );
+                }
                 invalidateBounds();
         }
@@ -1941 +1964 @@
                         return;
                 }
-
-                // if there is no text to paint, do nothing.
-                if (_text == null) {
-                        return;
-                }
+                
+                boolean hasContent = !(_text == null || (_text.length() == 0 && getMinWidth() == null));
+                boolean hasPlaceholderContent = getPlaceholder() != null;
+
 
                 // if the text to paint is empty string and there is no min width, do nothing.
-                if ((_text.length() == 0 && getMinWidth() == null)) {
+                if (!hasContent && !hasPlaceholderContent) {
                         return;
                 }
@@ -2025 +2047 @@
                         paintColour = new Colour(paintColour);
                         paintColour.setAlpha(Colour.FromComponent255(_alpha));
-
+                }
+                if (getTextLayouts() == _placeholderTextLayouts) {
+                        paintColour = paintColour.clone();
+                        paintColour.setAlpha(Colour.FromComponent255(60));
                 }
 
@@ -3108 +3133 @@
                 _mask = c;
         }
+        
+        public String getPlaceholder() {
+                if (_placeholder == null || _placeholder.length() == 0) {
+                        return null;
+                }
+                return _placeholder.toString();
+        }
+
+        public void setPlaceholder(String _placeholder) {
+                this._placeholder = new StringBuffer(_placeholder);
+        }
 
         protected List<TextLayout> getTextLayouts() {
-                if (this.getMask() != null) {
+                if (this.getPlaceholder() != null && (this._text == null || this._text.length() == 0)) {
+                        return _placeholderTextLayouts;
+                } else if (this.getMask() != null) {
                         return _maskTextLayouts;
                 } else {