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

Timestamp:

06/20/08 16:48:33 (16 years ago)

Author:

ra33

Message:

Fixed rounding errors in Text class...
They caused a whole bunch of problems with small fonts and text items with several lines!

File:

• trunk/src/org/expeditee/items/Text.java (modified) (11 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;
@@ -396 +395 @@
                 float y = getLineDrop(last) * line;
 
-                int x = (Math.round(getX() + caret[0]) + getJustOffset(last));
+                float x = getX() + caret[0] + getJustOffset(last);
                 x = Math
                                 .min(
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, Math.round(getY() + y + caret[1]));
+                return new Point(Math.round(x), Math.round(getY() + y + caret[1]));
         }
 
@@ -617 +616 @@
                 float y = getLineDrop(current) * line;
 
-                int x = Math.round(getX() + caret[0]) + getJustOffset(current);
+                float x = getX() + caret[0] + getJustOffset(current);
                 x = Math
                                 .min(
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, Math.round(getY() + y + caret[1]));
+                return new Point(Math.round(x), Math.round(getY() + y + caret[1]));
         }
 
@@ -701 +700 @@
                 float y = getLineDrop(current) * line;
 
-                return new Point(Math.round(getX() + caret[0])
-                                + getJustOffset(current), Math.round(getY() + y + caret[1]));
+                return new Point(
+                                Math.round(getX() + caret[0]) + getJustOffset(current), Math
+                                                .round(getY() + y + caret[1]));
         }
 
@@ -715 +715 @@
          * @return The position in the string of the character being pointed at.
          */
-        private TextHitInfo getCharPosition(int line, int mouseX) {
+        public TextHitInfo getCharPosition(int line, int mouseX) {
                 if (line < 0 || line >= _textLayouts.size())
                         return null;
@@ -726 +726 @@
         }
 
-        private int getLinePosition(int mouseY) {
+        public int getLinePosition(int mouseY) {
                 mouseY += getOffset().y;
 
-                int y = getY();
+                float y = getY();
 
                 for (TextLayout text : _textLayouts) {
                         // calculate X to ensure it is in the shape
-                        Rectangle bounds = text.getLogicalHighlightShape(0,
-                                        text.getCharacterCount()).getBounds();
+                        Rectangle2D bounds = text.getLogicalHighlightShape(0,
+                                        text.getCharacterCount()).getBounds2D();
 
                         if (bounds.getWidth() < 1)
-                                bounds = new Rectangle((int) bounds.getMinX(), (int) bounds
-                                                .getMinY(), 10, (int) bounds.getHeight());
+                                bounds.setRect(bounds.getMinX(), bounds
+                                                .getMinY(), 10, bounds.getHeight());
 
                         double x = bounds.getCenterX();
 
-                        // if(text.getLogicalHighlightShape(0,
-                        // text.getCharacterCount()).contains(text.getBounds().getMinX()
-                        // + 10, mouseY - getY() - (y - getY())))
                         if (bounds.contains(x, mouseY - getY() - (y - getY())))
                                 return _textLayouts.indexOf(text);
@@ -973 +970 @@
         public boolean intersects(Polygon p) {
                 if (super.intersects(p)) {
-                        int textY = getY();
+                        float textY = getY();
 
                         for (TextLayout text : _textLayouts) {
                                 // check left and right of each box
-                                Rectangle textOutline = text.getLogicalHighlightShape(0,
-                                                text.getCharacterCount()).getBounds();
-                                textOutline.width += 2;
-                                textOutline.height += 2;
-
-                                textOutline.translate(getX() - 1, textY - 1);
+                                Rectangle2D textOutline = text.getLogicalHighlightShape(0,
+                                                text.getCharacterCount()).getBounds2D();
+                                textOutline
+                                                .setRect(textOutline.getX() + getX() - 1, textOutline
+                                                                .getY()
+                                                                + textY - 1, textOutline.getWidth() + 2,
+                                                                textOutline.getHeight() + 2);
                                 if (p.intersects(textOutline))
                                         return true;
@@ -1000 +998 @@
                 mouseY += getOffset().y;
 
-                int textY = getY();
-                int textX = getX();
-
-                Rectangle outline = getPolygon().getBounds();
+                float textY = getY();
+                float textX = getX();
+
+                Rectangle2D outline = getPolygon().getBounds2D();
 
                 // Check if its outside the top and left and bottom bounds
-                if (outline.x - mouseX > gravity || outline.y - mouseY > gravity
-                                || mouseY - (outline.y + outline.height) > gravity
-                                || mouseX - (outline.x + outline.width) > gravity) {
+                if (outline.getX() - mouseX > gravity
+                                || outline.getY() - mouseY > gravity
+                                || mouseY - (outline.getY() + outline.getHeight()) > gravity
+                                || mouseX - (outline.getX() + outline.getWidth()) > gravity) {
                         return false;
                 }
@@ -1014 +1013 @@
                 for (TextLayout text : _textLayouts) {
                         // check left and right of each box
-                        Rectangle textOutline = text.getLogicalHighlightShape(0,
-                                        text.getCharacterCount()).getBounds();
+                        Rectangle2D textOutline = text.getLogicalHighlightShape(0,
+                                        text.getCharacterCount()).getBounds2D();
 
                         // check if the cursor is within the top, bottom and within the
                         // gravity of right
-                        if (mouseY - textY > textOutline.y
-                                        && mouseY - textY < textOutline.y + textOutline.height
-                                        && mouseX - textX < textOutline.width + gravity
+                        if (mouseY - textY > textOutline.getY()
+                                        && mouseY - textY < textOutline.getY()
+                                                        + textOutline.getHeight()
+                                        && mouseX - textX < textOutline.getWidth() + gravity
                                                         + Item.MARGIN_RIGHT)
                                 return true;
@@ -1353 +1353 @@
                         g.setColor(getPaintHighlightColor());
                         Stroke _highlightStroke = new BasicStroke(
-                                        (float) _highlightThickness, BasicStroke.CAP_BUTT,
-                                        BasicStroke.JOIN_ROUND);
+                                        (float) _highlightThickness, CAP, JOIN);
                         g.setStroke(_highlightStroke);
                         g.drawPolygon(getPolygon());
@@ -1621 +1620 @@
                         // bottom of text lines... so the cursor must be between two text
                         // lines
-                        int textY = getY();
-                        int textX = getX();
+                        float textY = getY();
+                        float textX = getX();
 
                         for (TextLayout text : _textLayouts) {
                                 // check left and right of each box
-                                Rectangle textOutline = text.getLogicalHighlightShape(0,
-                                                text.getCharacterCount()).getBounds();
+                                Rectangle2D textOutline = text.getLogicalHighlightShape(0,
+                                                text.getCharacterCount()).getBounds2D();
 
                                 // check if the cursor is within the top, bottom and within the
                                 // gravity of right
-                                if (y - textY > textOutline.y - NEAR_DISTANCE
-                                                && y - textY < textOutline.y + textOutline.height
-                                                                + NEAR_DISTANCE
-                                                && x - textX < textOutline.width + NEAR_DISTANCE)
+                                if (y - textY > textOutline.getY() - NEAR_DISTANCE
+                                                && y - textY < textOutline.getY()
+                                                                + textOutline.getHeight() + NEAR_DISTANCE
+                                                && x - textX < textOutline.getWidth() + NEAR_DISTANCE)
                                         return true;
                                 textY += getLineDrop(text);