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

Timestamp:

07/10/08 11:01:16 (16 years ago)

Author:

ra33

Message:

Added search functionality...
Also fixed repaint issues

File:

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

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

@@ -8 +8 @@
 import java.awt.Point;
 import java.awt.Polygon;
+import java.awt.Rectangle;
 import java.awt.Stroke;
 import java.awt.event.KeyEvent;
@@ -807 +808 @@
          */
         public void setFont(Font font) {
+                invalidateAll();
                 // all decoding occurs in the Utils class
-                
                 _font = font;
                 // rejustify();
                 rebuild(false);
+                
+                invalidateAll();
         }
 
@@ -907 +910 @@
                 } else if (newFace.equals("italic")) {
                         setFont(getPaintFont().deriveFont(Font.ITALIC));
-                } else if (newFace.contains("bold") && newFace.contains("italic")) {
+                } else if (newFace.equals("bolditalic") || newFace.equals("italicbold")) {
                         setFont(getPaintFont().deriveFont(Font.BOLD + Font.ITALIC));
                 }
@@ -1415 +1418 @@
                 paintLink(g);
         }
+        
+        @Override
+        protected Rectangle getLinkDrawArea() { // TODO: Revise
+                return getDrawingArea()[0];
+        }
 
         /**
@@ -1465 +1473 @@
         @Override
         public void setSize(float size) {
+                invalidateAll();
                 // Dont want to have size set when duplicating a point which has size 0
                 if (size < 0)
@@ -1472 +1481 @@
                         size = MINIMUM_FONT_SIZE;
                 setFont(getPaintFont().deriveFont(size));
+                invalidateAll();
         }
 
@@ -1737 +1747 @@
         }
 
-        @Override
-        public void setLink(String frame) {
-                // If a link is being removed or set then need to reset poly so the
-                // highlighting is drawn with the correct width
-                if (frame == null || getLink() == null)
-                        _poly = null;
-                super.setLink(frame);
-        }
-
         public static boolean isBulletChar(char c) {
                 for(int i = 0; i < BULLETS.length; i++){