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

Timestamp:

09/26/08 13:03:26 (16 years ago)

Author:

ra33

Message:

Fixed minor bugs

File:

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

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

@@ -602 +602 @@
                         if (text.charAt(0) == KeyEvent.VK_BACK_SPACE) {
                                 if (hasSelection()) {
-                                        cutSelectedText();
-                                        clearSelection();
+                                        pos = deleteSelection(pos);
                                 } else if (insertPos > 0) {
                                         deleteChar(insertPos - 1);
@@ -612 +611 @@
                         } else if (text.charAt(0) == KeyEvent.VK_DELETE) {
                                 if (hasSelection()) {
-                                        cutSelectedText();
-                                        clearSelection();
+                                        pos = deleteSelection(pos);
                                 } else if (insertPos < _text.length()) {
                                         deleteChar(insertPos);
@@ -719 +717 @@
         }
 
+        /**
+         * @param pos
+         * @return
+         */
+        private int deleteSelection(int pos) {
+                int selectionLength = getSelectionSize();
+                cutSelectedText();
+                clearSelection();
+                pos -= selectionLength;
+                return pos;
+        }
+
         public Point2D.Float moveCursor(int direction, float mouseX, float mouseY,
                         boolean setSelection) {