Changeset 1382

Timestamp:

05/27/19 13:50:07 (5 years ago)

Author:

bln4

Message:

Functionality for tab index. When a user is cursored over a text item with a _tabIndex property and hits tab (or shift tab), instead of adding a tab to the text item, it will find another text item on the frame with the next highest (or lowerest) _tabIndex property and move the cursor to it.

Location:

trunk/src/org/expeditee

Files:

• assets/resources-public/framesets/authentication/1.exp (modified) (15 diffs)
• gio/gesture/StandardGestureActions.java (modified) (1 diff)
• items/Text.java (modified) (1 diff)

trunk/src/org/expeditee/assets/resources-public/framesets/authentication/1.exp

@@ -13 +13 @@
 P 105 65
 T Secure Expeditee:
-o nobody
+o authadmin
 v S
 f Metamorphous_r36
@@ -26 +26 @@
 P 20 104
 T 🔒
-o nobody
+o authadmin
 v S
 f tr74
@@ -39 +39 @@
 P 105 115
 T Sleek like Aphroditē–Wise like Athēnâ.
-o nobody
+o authadmin
 v S
 f Metamorphous_r36
@@ -52 +52 @@
 P 364 185
 T Login to Expeditee
-o nobody
+o authadmin
 v S
 f Amaranth_r36
@@ -79 +79 @@
 h 1.0
 p 44
+_ph Username
+_ti 1
 
 S T 61
@@ -100 +102 @@
 h 1.0
 p 44
+_ph Password
+_ti 2
 
 S T 62
@@ -110 +114 @@
 X AuthLogin
 x F
-o nobody
+o authadmin
 n F
 v S
@@ -126 +130 @@
 P 602 435
 e 100 100 39 100
-o nobody
+o authadmin
 v S
 h 2.0
@@ -137 +141 @@
 P 393 435
 e 100 100 39 100
-o nobody
+o authadmin
 v S
 h 2.0
@@ -149 +153 @@
 T Create Account
 F 2
-o nobody
+o authadmin
 n F
 v S
@@ -164 +168 @@
 T 
 F 2
-o nobody
+o authadmin
 n F
 v S
@@ -179 +183 @@
 T Forgot Password
 F 4
-o nobody
+o authadmin
 n F
 v S
@@ -194 +198 @@
 T 
 F 4
-o nobody
+o authadmin
 n F
 v S
@@ -208 +212 @@
 P 393 526
 e 100 100 39 100
-o nobody
+o authadmin
 v S
 h 2.0
@@ -219 +223 @@
 P 602 526
 e 100 100 39 100
-o nobody
+o authadmin
 v S
 h 2.0

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

@@ -1277 +1277 @@
                 if (c == '\t') {
                         if (isShiftDown) {
-                                newMouse = text.removeTab(c, oldX, oldY);
+                                Text tabPrevious = text.getTabPrevious();
+                                if (tabPrevious == null) {
+                                        newMouse = text.removeTab(c, oldX, oldY);
+                                } else {
+                                        StandardGestureActions.moveCursorAndFreeItems(tabPrevious.getX(), tabPrevious.getY());
+                                        return text;
+                                }
                         } else {
-                                newMouse = text.insertTab(c, oldX, oldY);
+                                Text tabNext = text.getTabNext();
+                                if (tabNext == null) {
+                                        newMouse = text.insertTab(c, oldX, oldY);
+                                } else {
+                                        StandardGestureActions.moveCursorAndFreeItems(tabNext.getX(), tabNext.getY());
+                                        return text;
+                                }
                         }
                 } else {

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

@@ -3192 +3192 @@
                 this._tabIndex = index;
         }
+        
+        public Text getTabNext() {
+                if (this._tabIndex >= 0) {
+                        Collection<Text> textItems = this.getParent().getTextItems();
+                        Text ret = null;
+                        
+                        for (Text t: textItems) {
+                                if (t._tabIndex > this._tabIndex) {
+                                        if (ret == null) {
+                                                ret = t;
+                                        } else if (t._tabIndex < ret._tabIndex) {
+                                                ret = t;
+                                        }
+                                }
+                        }
+                        
+                        return ret;
+                } else {
+                        return null;
+                }
+        }
+        
+        public Text getTabPrevious() {
+                if (this._tabIndex >= 0) {
+                        Collection<Text> textItems = this.getParent().getTextItems();
+                        Text ret = null;
+                        
+                        for (Text t: textItems) {
+                                if (t._tabIndex < this._tabIndex) {
+                                        if (ret == null) {
+                                                ret = t;
+                                        } else if (t._tabIndex > ret._tabIndex) {
+                                                ret = t;
+                                        }
+                                }
+                        }
+                        
+                        return ret;
+                } else {
+                        return null;
+                }
+        }
 }