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

Timestamp:

06/20/08 12:55:35 (16 years ago)

Author:

ra33

Message:

Made a whole lot of changes...

Including using polyLine etc for drawing rectangles nicer

File:

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

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

@@ -58 +58 @@
         public static final int MINIMUM_RANGED_CHARS = 2;
 
-        public static final int UP = 0;
-
-        public static final int DOWN = 1;
-
-        public static final int LEFT = 2;
-
-        public static final int RIGHT = 3;
-
-        public static final int HOME = 4;
-
-        public static final int END = 5;
-
-        public static final int PAGE_DOWN = 6;
-
-        public static final int PAGE_UP = 7;
+        public static final int NONE = 0;
+
+        public static final int UP = 1;
+
+        public static final int DOWN = 2;
+
+        public static final int LEFT = 3;
+
+        public static final int RIGHT = 4;
+
+        public static final int HOME = 5;
+
+        public static final int END = 6;
+
+        public static final int PAGE_DOWN = 7;
+
+        public static final int PAGE_UP = 8;
 
         private int _maxWidth = -1;
@@ -392 +394 @@
                 // move the cursor to the new location
                 float[] caret = last.getCaretInfo(hit);
-                int y = getLineDrop(last) * line;
-
-                int x = ((int) (getX() + caret[0]) + getJustOffset(last));
+                float y = getLineDrop(last) * line;
+
+                int x = ((int) (getX() + caret[0] + 0.5) + getJustOffset(last));
                 x = Math
                                 .min(
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, getY() + /* DisplayIO.getOffset() + */y
-                                + (int) caret[1]);
+                return new Point(x, (int) (getY() + y + caret[1] + 0.5));
         }
 
@@ -614 +615 @@
                 // move the cursor to the new location
                 float[] caret = current.getCaretInfo(hit);
-                int y = getLineDrop(current) * line;
-
-                int x = ((int) (getX() + caret[0]) + getJustOffset(current));
+                float y = getLineDrop(current) * line;
+
+                int x = (int) (getX() + caret[0] + 0.5) + getJustOffset(current);
                 x = Math
                                 .min(
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, getY() + y + (int) caret[1]);
+                return new Point(x, (int) (getY() + y + caret[1] + 0.5));
         }
 
@@ -698 +699 @@
                 // move the cursor to the new location
                 float[] caret = current.getCaretInfo(hit);
-                int y = getLineDrop(current) * line;
-
-                return new Point((int) (getX() + caret[0]) + getJustOffset(current),
-                                getY() + y + (int) caret[1]);
+                float y = getLineDrop(current) * line;
+
+                return new Point((int) (getX() + caret[0] + 0.5)
+                                + getJustOffset(current), (int) (getY() + y + caret[1] + 0.5));
         }
 
@@ -937 +938 @@
         }
 
-        private int getLineDrop(TextLayout layout) {
+        private float getLineDrop(TextLayout layout) {
                 if (getSpacing() < 0)
-                        return (int) (layout.getAscent() + layout.getDescent() + layout
-                                        .getLeading());
-
-                return (int) (layout.getAscent() + layout.getDescent() + getSpacing());
+                        return layout.getAscent() + layout.getDescent()
+                                        + layout.getLeading();
+
+                return layout.getAscent() + layout.getDescent() + getSpacing();
         }