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

Timestamp:

05/23/08 09:02:59 (16 years ago)

Author:

ra33

Message:

Added lots of stuff

File:

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

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

@@ -22 +22 @@
 import java.util.List;
 
+import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
 
@@ -745 +747 @@
         }
 
+        public static final String MONOSPACED_FONT = "monospaced";
+
         public static final String[] FONT_WHEEL = { "sansserif", "monospaced",
                         "serif", "dialog", "dialoginput" };
@@ -751 +755 @@
 
         private static final int NEARBY_GRAVITY = 2;
+
+        private static final int MINIMUM_FONT_SIZE = 8;
 
         public void toggleFontFamily() {
@@ -939 +945 @@
                 }
 
-                // check if the cursor is on the left border of the bounding box
-                if (Math.abs(mouseX - LEFT_MARGIN - outline.x) <= gravity) {
-                        return true;
-                }
-
                 for (TextLayout text : _textLayouts) {
                         // check left and right of each box
@@ -953 +954 @@
                         if (mouseY - textY > textOutline.y
                                         && mouseY - textY < textOutline.y + textOutline.height
-                                        && mouseX - textX < textOutline.width + gravity)
+                                        && mouseX - textX < textOutline.width + gravity
+                                                        + Item.MARGIN_RIGHT)
                                 return true;
                         textY += getLineDrop(text);
@@ -999 +1001 @@
                 }
 
-                minX -= Item.MARGIN_RIGHT;
-
-                if (getWidth() > 0)
-                        maxX = getWidth();
+                minX -= getLeftMargin();
+                maxX += Item.MARGIN_RIGHT;
 
                 _poly.addPoint(minX - getGravity(), minY - getGravity());
@@ -1008 +1008 @@
                 _poly.addPoint(maxX + getGravity(), maxY + getGravity());
                 _poly.addPoint(minX - getGravity(), maxY + getGravity());
-
-                // _poly.addPoint(minX, minY);
-                // _poly.addPoint(maxX, minY);
-                // _poly.addPoint(maxX, maxY);
-                // _poly.addPoint(minX, maxY);
+        }
+
+        /**
+         * Gets the distance between the start of the text and the left border of
+         * the item. This distance changes depending on whether or not the item is
+         * linked or has an associated action.
+         * 
+         * @return the gap size in pixels
+         */
+        private int getLeftMargin() {
+                return ((getLinkMark() && getLink() != null)
+                                || (getActionMark() && getAction() != null) ? Item.MARGIN_LEFT
+                                - Item.MARGIN_RIGHT : Item.MARGIN_RIGHT);
         }
 
@@ -1389 +1397 @@
         @Override
         public void setSize(int size) {
-                setFont(getPaintFont().deriveFont((float) size));
+                if (size >= MINIMUM_FONT_SIZE)
+                        setFont(getPaintFont().deriveFont((float) size));
         }
 
@@ -1399 +1408 @@
                                 return;
 
-                        /*
-                         * // Remove 'a: ' from the begining if it is there if
-                         * (_text.length() > 3 && _text.charAt(0) == 'a' && _text.charAt(1) ==
-                         * ':') { _text.delete(0, 2); while (_text.charAt(0) == ' ')
-                         * _text.delete(0, 1); }
-                         */
                         _text.insert(0, "@");
 
@@ -1418 +1421 @@
                                 return;
 
+                        if (_text.length() == 1) {
+                                // Remove and replace with a dot
+                                FrameKeyboardActions.replaceText(this);
+
+                                DisplayIO.setCursorPosition(this.getPosition());
+                                return;
+                        }
+
                         _text.deleteCharAt(0);
 
@@ -1432 +1443 @@
         @Override
         public boolean isAnnotation() {
-                if (_text != null && _text.length() > 0 && _text.indexOf("@") == 0)
+                if (_text != null && _text.length() > 0 && _text.charAt(0) == '@')
                         return true;