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

Timestamp:

07/03/08 16:48:09 (16 years ago)

Author:

bjn8

Message:

Added invalidation for graphics... biiiig commit. LOts of effeciency improvements - now can animate

File:

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

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

@@ -182 +182 @@
         }
 
+        @Override
+        public Color getHighlightColor() {
+                if (_highlightColor.equals(getPaintBackgroundColor()))
+                        return ALTERNATE_HIGHLIGHT;
+                return _highlightColor;
+        }
+
+        
         /**
          * Sets the justification of this Text item. The given integer should
@@ -225 +233 @@
          */
         public void setText(String text) {
+        //      if (_text != null && text.length() < _text.length())
+        //              invalidateAll();
                 _text = new StringBuffer(text);
                 rebuild(false);
+        //      invalidateAll();
         }
 
@@ -265 +276 @@
          */
         public void removeText(String text) {
-                if (_text.length() > 0 && _text.indexOf(text) == 0)
+                
+                if (_text.length() > 0 && _text.indexOf(text) == 0) {
+                        //invalidateAll();
                         _text.delete(0, text.length());
+                }
+                
 
         }
@@ -273 +288 @@
                 int length = _text.length();
                 if (length > 0) {
+                        //invalidateAll();
                         int pos = _text.indexOf(textToRemove);
                         int textToRemoveLength = textToRemove.length();
@@ -279 +295 @@
                         }
                 }
+                
         }
 
@@ -411 +428 @@
                 TextHitInfo hit = getCharPosition(line, mouseX);
                 _selectionStart = hit.getInsertionIndex() + _lineOffsets.get(line);
+                invalidateAll();
         }
 
@@ -420 +438 @@
                 TextHitInfo hit = getCharPosition(line, mouseX);
                 _selectionEnd = hit.getInsertionIndex() + _lineOffsets.get(line);
+                invalidateAll();
         }
 
@@ -425 +444 @@
                 _selectionStart = -1;
                 _selectionEnd = -1;
+                invalidateAll();
         }
 
         public void clearSelectionEnd() {
                 _selectionEnd = -1;
+                invalidateAll();
         }
 
@@ -448 +469 @@
                 if (_selectionStart < 0 || _selectionEnd < 0)
                         return null;
-                else if (_selectionEnd > _text.length())
+                
+                invalidateAll();
+                
+                if (_selectionEnd > _text.length())
                         _selectionEnd = _text.length();
 
@@ -459 +483 @@
                 _text.insert(left, newText);
                 rebuild(true);
+                
+                invalidateAll();
 
                 return s;
@@ -493 +519 @@
                 TextLayout current = null;
                 int line;
+                
+                invalidateAll();
 
                 // check for empty string
@@ -635 +663 @@
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
+                
+                invalidateAll();
+                
                 return new Point2D.Float(Math.round(x), Math.round(getY() + y
                                 + caret[1]));
@@ -777 +808 @@
         public void setFont(Font font) {
                 // all decoding occurs in the Utils class
+                
                 _font = font;
-
                 // rejustify();
                 rebuild(false);
@@ -1105 +1136 @@
                         return;
                 }
-
+                
                 AttributedString paragraphText = new AttributedString(_text.toString());
                 paragraphText.addAttribute(TextAttribute.FONT, getPaintFont());
@@ -1154 +1185 @@
 
                 updatePolygon();
+                
         }
 
@@ -1515 +1547 @@
                         _lineBreaker.deleteChar(inserting.getIterator(), pos);
                 }
+                
+                
+                
         }
 
@@ -1682 +1717 @@
         @Override
         protected int getLinkYOffset() {
+                if (_textLayouts.size() == 0) return  0;
                 return Math.round(-(_textLayouts.get(0).getAscent() / 2));
         }