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

Timestamp:

09/13/18 12:30:53 (6 years ago)

Author:

bln4

Message:

org.apollo.items.EmulatedTextItem ->
org.expeditee.agents.GraphFramesetLinks ->
org.expeditee.gio.FontManager ->
org.expeditee.gio.javafx.JavaFXFontManager ->
org.expeditee.gio.swing.SwingFontManager ->
org.expeditee.gui.MessageBay ->
org.expeditee.io.WebParser ->
org.expeditee.items.Text ->

The above files are been altered so that there is no longer any chance Font references will be shared amongst Text Items. How default Fonts are used has been altered so that a Text Item using the default font remember that this is the case. This is a follow up to an initial fix for the same problem that turned out to be insufficient.

File:

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

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

@@ -979 +979 @@
                         // if a rebuild is required
                         rebuild(true, false);
-
+                        
                         // determine the new position the cursor should have
                         for (int i = 0; i < _textLayouts.size(); i++) {
@@ -992 +992 @@
 
                         if (newLine == lineIndex) {
+//                              System.err.println("newLine == lineIndex");
                                 if (insertionIndex > 0)
                                         hit = current.getNextRightHit(insertionIndex - 1);
@@ -1008 +1009 @@
                 float[] caret = current.getCaretInfo(hit);
                 float y = getLineDrop(current) * lineIndex;
+                y = getY() + y + caret[1];
 
                 float x = getX() + caret[0] + getJustOffset(current);
-                x = Math.min(
-                                                x,
-                                                (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth())
-                );
-
-                invalidateAll();
-
-                return new Point(Math.round(x), Math.round(getY() + y + caret[1]));
+                x = Math.min(x, (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
+
+                invalidateAll();
+                
+//              System.err.println("Mouse location: " + mouseX + "," + mouseY);
+//              System.err.println("Caret location: " + caret[0] + "," + caret[1]);
+
+//              System.err.println(text);
+//              System.err.println("X delta: " + (x - getX()));
+                final Point newCursor = new Point(Math.round(x), Math.round(y));
+//              System.err.println("Moving cursor to: " + newCursor);
+                return newCursor;
         }
 
@@ -1223 +1229 @@
         {
                 invalidateAll();
-                // all decoding occurs in the Utils class
+                
                 _font = font;
-                // rejustify();
+
                 rebuild(false);
 
@@ -1247 +1253 @@
         public Font getPaintFont()
         {
-                if (getFont() == null) {
-                        return EcosystemManager.getFontManager().getDefaultFont().clone();
-                }
-                return getFont();
+                final Font f = getFont();
+                if (f == null) {
+                        _font = EcosystemManager.getFontManager().getDefaultFont().clone(); 
+                        return _font;
+                }
+                return f;
         }
 
@@ -1324 +1332 @@
                 Font currentFont = getPaintFont();
                 currentFont.toggleBold();
-                setFont(currentFont);
+                //setFont(currentFont);
                 rebuild(true);
                 invalidateAll();
@@ -1333 +1341 @@
                 Font currentFont = getPaintFont();
                 currentFont.toggleItalic();
-                setFont(currentFont);
+                //setFont(currentFont);
                 rebuild(true);
                 invalidateAll();
@@ -1343 +1351 @@
                 if (newFace == null || newFace.trim().length() == 0) {
                         currentFont.setStyle(Font.Style.PLAIN);
-                        setFont(currentFont);
+                        //setFont(currentFont);
                         return;
                 }
@@ -1359 +1367 @@
                 }
                 
-                setFont(currentFont);
+                //setFont(currentFont);
 
         }
@@ -1478 +1486 @@
                 Font currentFont = getPaintFont();
                 currentFont.setSpacing(spacing);
-                setFont(currentFont);
+                //setFont(currentFont);
         }
 
@@ -1916 +1924 @@
                                 fill = null;
                         }
+//                      System.err.println("Top left: " + getBoundingBox().getTopLeft() + ", " + "Bottom right: " + getBoundingBox().getBottomRight());
                         g.drawRectangle(bounds, 0.0, fill, getPaintHighlightColor(), highlightStroke, null);
                 }
@@ -1989 +1998 @@
                 copy.setWordSpacing(getWordSpacing());
                 copy.setWidth(getWidthToSave());
-                copy.setFont(getFont());
+                copy.setFont(getFont().clone());
                 if (hasFormula()) {
                         copy.calculate(getFormula());
@@ -2025 +2034 @@
                 Font currentFont = getPaintFont();
                 currentFont.setSize((int) size);
-                setFont(currentFont);
+                //setFont(currentFont);
                 rebuild(true);
                 invalidateAll();