diff options
Diffstat (limited to 'srcs/juloo.keyboard2/Config.java')
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 321ed9c..56843c4 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -319,7 +319,7 @@ public final class Config public KeyboardData modify_numpad(KeyboardData kw, KeyboardData main_kw) { final KeyValue action_key = action_key(); - final KeyModifier.Map_char map_digit = KeyModifier.modify_numpad_script(main_kw.numpad_script); + final int map_digit = KeyModifier.modify_numpad_script(main_kw.numpad_script); return kw.mapKeys(new KeyboardData.MapKeyValues() { public KeyValue apply(KeyValue key, boolean localized) { @@ -345,9 +345,9 @@ public final class Config char c = prev_c; if (inverse_numpad) c = inverse_numpad_char(c); - String modified = map_digit.apply(c); + KeyValue modified = ComposeKey.apply(map_digit, c); if (modified != null) // Was modified by script - return KeyValue.makeStringKey(modified); + return modified; if (prev_c != c) // Was inverted return key.withChar(c); break; @@ -359,16 +359,16 @@ public final class Config static KeyboardData.MapKeyValues numpad_script_map(String numpad_script) { - final KeyModifier.Map_char map_digit = KeyModifier.modify_numpad_script(numpad_script); + final int map_digit = KeyModifier.modify_numpad_script(numpad_script); return new KeyboardData.MapKeyValues() { public KeyValue apply(KeyValue key, boolean localized) { switch (key.getKind()) { case Char: - String modified = map_digit.apply(key.getChar()); + KeyValue modified = ComposeKey.apply(map_digit, key.getChar()); if (modified != null) - return KeyValue.makeStringKey(modified); + return modified; break; } return key; |