abouttreesummaryrefslogcommitdiff
path: root/srcs/juloo.keyboard2/Keyboard2.java
diff options
context:
space:
mode:
authorJules Aguillon2023-01-30 22:33:01 +0100
committerJules Aguillon2023-01-30 22:33:01 +0100
commit90b7944129ae0facc5c789f0a416f7ff36925a90 (patch)
treeedb7f6523230719a799315430ea8efe88aecffe9 /srcs/juloo.keyboard2/Keyboard2.java
parent2539feadcd370e98d3750f6b6b06664e0eb14d0b (diff)
downloadunexpected-keyboard-90b7944129ae0facc5c789f0a416f7ff36925a90.tar.gz
unexpected-keyboard-90b7944129ae0facc5c789f0a416f7ff36925a90.zip
Apply modify_layout to text layout only
Refactor. Allows to remove the 'extra_keys' and 'num_pad' flags and to implement more complicated transformations to the layouts.
Diffstat (limited to 'srcs/juloo.keyboard2/Keyboard2.java')
-rw-r--r--srcs/juloo.keyboard2/Keyboard2.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 6558539..5070439 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -47,9 +47,14 @@ public class Keyboard2 extends InputMethodService
{
if (_currentSpecialLayout != null)
return _currentSpecialLayout;
+ KeyboardData layout;
if (_currentTextLayout == Current_text_layout.SECONDARY)
- return _config.second_layout;
- return (_config.layout == null) ? _localeTextLayout : _config.layout;
+ layout = _config.second_layout;
+ else if (_config.layout == null)
+ layout = _localeTextLayout;
+ else
+ layout = _config.layout;
+ return _config.modify_layout(layout);
}
void setTextLayout(Current_text_layout layout)