Changeset 1126 for trunk

Timestamp:

09/13/18 15:15:05 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java (modified) (4 diffs)

trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

@@ -400 +400 @@
                         public void exec(Gesture gesture) {
                                 InsertStringGestureData data = (InsertStringGestureData) gesture.getData();
-                                for (char c : data.getString().toCharArray()) processChar(c, data.isShiftDown());
+                                for (char c : data.getString().toCharArray()) {
+                                        processChar(c, data.isShiftDown());
+                                }
                         }
                 });
@@ -1125 +1127 @@
                         assert (_toRemove.getLength() == 0);
                         // This line is to protect mistaken removal of items if there is a bug...
-                        if (_toRemove.getLength() == 0) DisplayController.getCurrentFrame().removeItem(_toRemove);
+                        if (_toRemove.getLength() == 0) {
+                                DisplayController.getCurrentFrame().removeItem(_toRemove);
+                        }
                 }
                 _toRemove = null;
 
                 // ignore delete and backspace if in free space
-                if ((on == null || !(on instanceof Text)) && (ch == '\b' || ch == '\t' || ch == Text.DELETE_CHARACTER)) return;
+                if ((on == null || !(on instanceof Text)) 
+                                && (ch == '\b' || ch == '\t' || ch == Text.DELETE_CHARACTER)) {
+                        return;
+                }
 
                 SessionStats.TypedChar(ch);
@@ -1144 +1151 @@
 
                 // only text can interact with keyboard events
-                if (on != null && !(on instanceof Text)) on = null;
+                if (on != null && !(on instanceof Text)) {
+                        on = null;
+                }
 
                 // DisplayIO.UpdateTitle();
@@ -1206 +1215 @@
         public static Text insertCharacterAction(Text text, boolean isShiftDown, final char c)
         {
-                float oldY = DisplayController.getFloatMouseY();
+                final float oldY = DisplayController.getFloatMouseY();
+                final float oldX = DisplayController.getFloatMouseX();
+                System.err.println("insertCharacterAction: Prior to inserting character mouse at: " + oldX + "," + oldY);
                 Point newMouse = null;
                 if (c == '\t') {
                         if (isShiftDown) {
-                                newMouse = text.removeTab(c, DisplayController.getFloatMouseX(), DisplayController.getFloatMouseY());
+                                newMouse = text.removeTab(c, oldX, oldY);
                         } else {
-                                newMouse = text.insertTab(c, DisplayController.getFloatMouseX(), DisplayController.getFloatMouseY());
+                                newMouse = text.insertTab(c, oldX, oldY);
                         }
                 } else {
-                        newMouse = text.insertChar(c, DisplayController.getFloatMouseX(), DisplayController.getFloatMouseY());
+                        newMouse = text.insertChar(c, oldX, DisplayController.getFloatMouseY());
                 }