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

Timestamp:

06/05/08 10:11:18 (16 years ago)

Author:

ra33

Message:

Added DebugFrame action
Added GetCometStats
Lots of bug fixes

File:

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

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

@@ -353 +353 @@
         }
 
-        public Point getEndLinePosition(int mouseY) {
+        public Point getEndPosition(int mouseY) {
                 return getEdgePosition(getLinePosition(mouseY), false);
         }
 
-        public Point getStartLinePosition(int mouseY) {
+        public Point getStartPosition(int mouseY) {
                 return getEdgePosition(getLinePosition(mouseY), true);
         }
@@ -363 +363 @@
         public Point getEndParagraphPosition() {
                 return getEdgePosition(_textLayouts.size() - 1, false);
+        }
+        
+        public Point getStartParagraphPosition() {
+                return getEdgePosition(0, true);
         }
 
@@ -520 +524 @@
                                 // Text length greater than 1 signals a backwards tab
                                 if (text.length() > 1) {
-//                                       Find the first non space char to see if its a bullet
+                                        // Find the first non space char to see if its a bullet
                                         int index = 0;
                                         for (index = 0; index < _text.length(); index++) {
@@ -527 +531 @@
                                         }
                                         // Check if there is a space after the bullet
-                                        if (index < _text.length() - 1 && _text.charAt(index + 1) == ' ') {
+                                        if (index < _text.length() - 1
+                                                        && _text.charAt(index + 1) == ' ') {
                                                 // Change the bullet
-                                                _text.setCharAt(index, getPreviousBullet(_text.charAt(index)));
+                                                _text.setCharAt(index, getPreviousBullet(_text
+                                                                .charAt(index)));
                                         }
                                         // Remove the spacing at the start
                                         for (int i = 0; i < TAB_STRING.length(); i++) {
-                                                if (_text.length() > 0 && Character.isSpaceChar(_text.charAt(0))){
+                                                if (_text.length() > 0
+                                                                && Character.isSpaceChar(_text.charAt(0))) {
                                                         deleteChar(0, false);
                                                         pos--;
@@ -612 +619 @@
                 // check for home or end keys
                 if (direction == HOME)
-                        return getStartLinePosition(mouseY);
+                        return getStartParagraphPosition();
 
                 if (direction == END)
-                        return getEndLinePosition(mouseY);
+                        return getEndParagraphPosition();
 
                 TextHitInfo hit;
@@ -640 +647 @@
 
                         if (direction == LEFT) {
-                                if (hit.getInsertionIndex() > 0)
+                                if (hit.getInsertionIndex() > 0) {
                                         hit = _textLayouts.get(line).getNextLeftHit(hit);
-
-                                if (line > 0
-                                                && _text.charAt(hit.getInsertionIndex()
-                                                                + _lineOffsets.get(line)) == '\n') {
+                                        //This takes care of the case where the user has put a hard line break in
+                                        if (line > 0
+                                                        && _text.charAt(hit.getInsertionIndex()
+                                                                        + _lineOffsets.get(line)) == '\n') {
+                                                line--;
+                                                hit = _textLayouts.get(line).getNextRightHit(
+                                                                _textLayouts.get(line).getCharacterCount() - 1);
+                                        }
+                                        //This takes care of soft line breaks.
+                                } else if (line > 0) {
                                         line--;
                                         hit = _textLayouts.get(line).getNextRightHit(
                                                         _textLayouts.get(line).getCharacterCount() - 1);
+                                        while (hit.getCharIndex() > 0
+                                                        && _text.charAt(_lineOffsets.get(line)
+                                                                        + hit.getCharIndex()- 1) == ' '){
+                                                hit = _textLayouts.get(line).getNextLeftHit(hit);
+                                        }
                                 }
                         } else if (direction == RIGHT) {
@@ -1232 +1250 @@
                 // the background is only cleared if required
                 if (getBackgroundColor() != null) {
-                        g.setColor(getBackgroundColor());
+                        Color bgc = getBackgroundColor();
+                        if (_alpha > 0)
+                                bgc = new Color(bgc.getRed(), bgc.getGreen(), bgc.getBlue(),
+                                                _alpha);
+                        g.setColor(bgc);
                         g.fill(getPolygon());
                 }