Changeset 663

Timestamp:

01/08/14 10:01:57 (10 years ago)

Author:

jts21

Message:

Improve default text rebuilding behaviour (shouldn't impact performance at all, since it just reschedules rebuilding to happen before the item is painted next, which will be after other items have loaded, so the text can wrap correctly around them).
Also made text items automatically rebuild on frame load.
Could possibly further improve performance in some cases by replacing all calls to rebuild() with the deferred rebuild, which should speed up loading (since it would only have to rebuild once instead of rebuilding every time it changes a property).

File:

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

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

@@ -131 +131 @@
         // text is broken up into lines
         private StringBuffer _text = new StringBuffer();
+        private boolean _rebuildText = false;
 
         private List<TextLayout> _textLayouts = new LinkedList<TextLayout>();
@@ -206 +207 @@
 
                 _maxWidth = width;
-                rebuild(true);
+                // 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);
                 invalidateAll();
         }
@@ -403 +407 @@
 
                 _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;
         }
 
@@ -1660 +1669 @@
                 
                         rebuild(true);
-                } else if (_textLayouts.size() < 1) {
+                } else if (_rebuildText || _textLayouts.size() < 1) {
+                        clipFrameMargin();
                         rebuild(true);
-                        // System.out.println("Error: " + _text);
+                        _rebuildText = false;
                         // return;
                 }
@@ -2100 +2110 @@
                 String text = _text.toString().trim();
 
+                clipFrameMargin();
+
+                // Show the overlay stuff immediately if this is an overlay item
+                if (hasLink() && (text.startsWith("@ao") || text.startsWith("@o"))) {
+                        FrameKeyboardActions.Refresh();
+                }
+        }
+        
+        private void clipFrameMargin() {
                 if (!hasFixedWidth()) {
                         int frameWidth = FrameGraphics.getMaxFrameSize().width;
@@ -2106 +2125 @@
                          * the screen
                          */
-                        if (!text.contains(" ")) {
+                        if (!_text.toString().contains(" ")) {
                                 Integer width = getWidth();
                                 if (width == null || width < 0)
@@ -2114 +2133 @@
                                 // setRightMargin(frameWidth, false);
                         }
-                }
-
-                // Show the overlay stuff immediately if this is an overlay item
-                if (hasLink() && (text.startsWith("@ao") || text.startsWith("@o"))) {
-                        FrameKeyboardActions.Refresh();
                 }
         }