abouttreesummaryrefslogcommitdiff
path: root/srcs/juloo.keyboard2/Config.java
diff options
context:
space:
mode:
authorJules Aguillon2023-06-24 23:29:24 +0200
committerJules Aguillon2023-06-24 23:29:24 +0200
commit9bcfec8bd1c1662b250c0a313505aa6e0bc06383 (patch)
tree4b1e257793f60fc812e1c2fc7d2bfaba28b496b7 /srcs/juloo.keyboard2/Config.java
parent5fc68373d3ee0ce61cfb819f0e623e3a3f63c374 (diff)
downloadunexpected-keyboard-9bcfec8bd1c1662b250c0a313505aa6e0bc06383.tar.gz
unexpected-keyboard-9bcfec8bd1c1662b250c0a313505aa6e0bc06383.zip
Per-script extra keys
Allows to define a locale's script in 'method.xml' and use that to add the extra keys for a locale to layouts of the same script only. A locale of an undefined script will add its extra keys to every layouts. A layout of an undefined script will have the extra keys of all the enabled locales.
Diffstat (limited to 'srcs/juloo.keyboard2/Config.java')
-rw-r--r--srcs/juloo.keyboard2/Config.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 8406be2..3e9d624 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -57,7 +57,7 @@ final class Config
public String actionLabel; // Might be 'null'
public int actionId; // Meaningful only when 'actionLabel' isn't 'null'
public boolean swapEnterActionKey; // Swap the "enter" and "action" keys
- public Set<KeyValue> extra_keys_subtype;
+ public ExtraKeys extra_keys_subtype;
public Set<KeyValue> extra_keys_param;
public final IKeyEventHandler handler;
@@ -176,7 +176,7 @@ final class Config
final Set<KeyValue> extra_keys = new HashSet<KeyValue>();
final Set<KeyValue> remove_keys = new HashSet<KeyValue>();
if (extra_keys_subtype != null)
- extra_keys.addAll(extra_keys_subtype);
+ extra_keys_subtype.compute(extra_keys, kw.script);
extra_keys.addAll(extra_keys_param);
boolean number_row = this.number_row && !show_numpad;
if (number_row)