Changeset 776

Timestamp:

01/29/14 10:07:30 (10 years ago)

Author:

jts21

Message:

Fix bug with Text rebuilding, ignore width set on templates, change bullet points to use squares instead of circles (since the circles looked like the link/action marks)

File:

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

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

@@ -55 +55 @@
         public static String LINE_SEPARATOR = System.getProperty("line.separator");
 
-        public static char[] BULLETS = { '\u2219', '\u2218', '\u2217' };
+        // public static char[] BULLETS = { '\u2219', '\u2218', '\u2217' };
+        public static char[] BULLETS = { '\u25AA', '\u25AB', '\u2217' };
 
         private static char DEFAULT_BULLET = BULLETS[2];
@@ -131 +132 @@
         // text is broken up into lines
         private StringBuffer _text = new StringBuffer();
-        private boolean _rebuildText = false;
 
         private List<TextLayout> _textLayouts = new LinkedList<TextLayout>();
@@ -207 +207 @@
 
                 _maxWidth = width;
-                // delay rebuilding until the next time we redraw
-                // this makes sure other items will have loaded, so we will be able to rebuild correctly
-                _rebuildText = true;
-                // rebuild(true);
+                rebuild(true);
                 invalidateAll();
         }
@@ -408 +405 @@
                 _text.append(text);
                 
-                // rebuild at next redraw
-                // this makes sure the text item draws correctly upon loading a frame,
-                // and also keeps this method efficient
-                _rebuildText = true;
+                rebuild(true);
         }
 
@@ -1474 +1468 @@
                         width = Float.MAX_VALUE;
                 if (limitWidth) {
-                        width = getAbsoluteWidth();
+                        if(_maxWidth == null) {
+                                width = FrameGraphics.getMaxFrameSize().width - getX();
+                        } else {
+                                width = getAbsoluteWidth();
+                        }
                         // else if (getMaxWidth() > 0)
                         // width = Math.max(50, getMaxWidth() - getX()
@@ -1669 +1667 @@
                 
                         rebuild(true);
-                } else if (_rebuildText || _textLayouts.size() < 1) {
+                } else if (_textLayouts.size() < 1) {
                         clipFrameMargin();
                         rebuild(true);
-                        _rebuildText = false;
                         // return;
                 }
@@ -2061 +2058 @@
                 Text template = this.copy();
                 template.setID(-1);
+                // reset width of global templates so the widths of the items on the settings frames don't cause issues
+                // this is in response to the fact that FrameCreator.addItem() sets rightMargin when it adds items
+                template.setWidth(null);
                 /*
                  * The template must have text otherwise the bounds height will be