diff options
Diffstat (limited to 'srcs/juloo.keyboard2')
| -rw-r--r-- | srcs/juloo.keyboard2/KeyboardData.java | 18 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Pointers.java | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java index aca8ba3..0c54291 100644 --- a/srcs/juloo.keyboard2/KeyboardData.java +++ b/srcs/juloo.keyboard2/KeyboardData.java @@ -401,9 +401,6 @@ public final class KeyboardData public final float width; /** Extra empty space on the left of the key. */ public final float shift; - /** Keys 2 and 3 are repeated as the finger moves laterally on the key. - Used for the left and right arrow keys on the space bar. */ - public final boolean slider; /** String printed on the keys. It has no other effect. */ public final String indication; @@ -411,14 +408,13 @@ public final class KeyboardData public static final int F_LOC = 1; public static final int ALL_FLAGS = F_LOC; - protected Key(KeyValue[] ks, KeyValue antic, int f, float w, float s, boolean sl, String i) + protected Key(KeyValue[] ks, KeyValue antic, int f, float w, float s, String i) { keys = ks; anticircle = antic; keysflags = f; width = Math.max(w, 0f); shift = Math.max(s, 0f); - slider = sl; indication = i; } @@ -487,11 +483,10 @@ public final class KeyboardData KeyValue anticircle = parse_nonloc_key_attr(parser, "anticircle"); float width = attribute_float(parser, "width", 1f); float shift = attribute_float(parser, "shift", 0.f); - boolean slider = attribute_bool(parser, "slider", false); String indication = parser.getAttributeValue(null, "indication"); while (parser.next() != XmlPullParser.END_TAG) continue; - return new Key(ks, anticircle, keysflags, width, shift, slider, indication); + return new Key(ks, anticircle, keysflags, width, shift, indication); } /** Whether key at [index] as [flag]. */ @@ -503,8 +498,7 @@ public final class KeyboardData /** New key with the width multiplied by 's'. */ public Key scaleWidth(float s) { - return new Key(keys, anticircle, keysflags, width * s, shift, slider, - indication); + return new Key(keys, anticircle, keysflags, width * s, shift, indication); } public void getKeys(Map<KeyValue, KeyPos> dst, int row, int col) @@ -525,12 +519,12 @@ public final class KeyboardData for (int j = 0; j < keys.length; j++) ks[j] = keys[j]; ks[i] = kv; int flags = (keysflags & ~(ALL_FLAGS << i)); - return new Key(ks, anticircle, flags, width, shift, slider, indication); + return new Key(ks, anticircle, flags, width, shift, indication); } public Key withShift(float s) { - return new Key(keys, anticircle, keysflags, width, s, slider, indication); + return new Key(keys, anticircle, keysflags, width, s, indication); } public boolean hasValue(KeyValue kv) @@ -556,7 +550,7 @@ public final class KeyboardData for (int i = 0; i < ks.length; i++) if (k.keys[i] != null) ks[i] = apply(k.keys[i], k.keyHasFlag(i, Key.F_LOC)); - return new Key(ks, k.anticircle, k.keysflags, k.width, k.shift, k.slider, k.indication); + return new Key(ks, k.anticircle, k.keysflags, k.width, k.shift, k.indication); } } diff --git a/srcs/juloo.keyboard2/Pointers.java b/srcs/juloo.keyboard2/Pointers.java index 9323980..da8ba39 100644 --- a/srcs/juloo.keyboard2/Pointers.java +++ b/srcs/juloo.keyboard2/Pointers.java @@ -295,7 +295,7 @@ public final class Pointers implements Handler.Callback ptr.value = new_value; ptr.flags = pointer_flags_of_kv(new_value); // Start sliding mode - if (ptr.key.slider && new_value.getKind() == KeyValue.Kind.Slider) + if (new_value.getKind() == KeyValue.Kind.Slider) startSliding(ptr, x, (dx < 0 ? -1 : 1), new_value); _handler.onPointerDown(new_value, true); } |