Changeset 1142 for trunk/src/org/expeditee/gio/TextLayoutManager.java

Timestamp:

09/18/18 11:57:32 (6 years ago)

Author:

bln4

Message:

Used Eclipse refactoring to encapsulate Point.X and Point.Y

File:

• trunk/src/org/expeditee/gio/TextLayoutManager.java (modified) (3 diffs)

trunk/src/org/expeditee/gio/TextLayoutManager.java

@@ -17 +17 @@
         public List<TextLayout> layoutStringRelative(String string, Font font, int widthLimit, int lineSpacing, boolean dontBreakWords, boolean fullJustify)
         {
-                return layoutString(string, font, Point.ORIGIN, null, widthLimit, lineSpacing, dontBreakWords, fullJustify);
+                return layoutString(string, font, Point.ORIGIN.clone(), null, widthLimit, lineSpacing, dontBreakWords, fullJustify);
         }
         
@@ -71 +71 @@
                 for(Line l : lines) {
                         // check for lines that cross over our y
-                        if((l.getFirstEnd().y >= p.y && l.getSecondEnd().y <= p.y) || (l.getFirstEnd().y <= p.y && l.getSecondEnd().y >= p.y)) {
-                                float dX = l.getFirstEnd().x - l.getSecondEnd().x;
-                                float dY = l.getFirstEnd().y - l.getSecondEnd().y;
+                        if((l.getFirstEnd().getY() >= p.getY() && l.getSecondEnd().getY() <= p.getY()) || (l.getFirstEnd().getY() <= p.getY() && l.getSecondEnd().getY() >= p.getY())) {
+                                float dX = l.getFirstEnd().getX() - l.getSecondEnd().getX();
+                                float dY = l.getFirstEnd().getY() - l.getSecondEnd().getY();
                                 float newWidth;
                                 if(dX == 0) {
-                                        newWidth = l.getFirstEnd().x;
+                                        newWidth = l.getFirstEnd().getX();
                                 } else if(dY == 0) {
-                                        newWidth = Math.min(l.getFirstEnd().x, l.getSecondEnd().x);
+                                        newWidth = Math.min(l.getFirstEnd().getX(), l.getSecondEnd().getX());
                                 } else {
-                                        newWidth = l.getFirstEnd().x + (p.y - l.getFirstEnd().y) * dX / dY;
+                                        newWidth = l.getFirstEnd().getX() + (p.getY() - l.getFirstEnd().getY()) * dX / dY;
                                 }
-                                if(newWidth < p.x) {
+                                if(newWidth < p.getX()) {
                                         continue;
                                 }
@@ -90 +90 @@
                         }
                 }
-                return width - p.x;
+                return width - p.getX();
         }