From 4d10556d4904086664f14ac3b900e65505a19fe7 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 6 Aug 2023 17:11:29 +0200 Subject: Don't replace user selected dead keys Don't replace dead-keys selected in the "Add keys to the keyboard" option by an alternative. --- srcs/juloo.keyboard2/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'srcs/juloo.keyboard2/Config.java') diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 8a81556..24565ab 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -182,6 +182,8 @@ final class Config // first iteration then automatically added. final Set extra_keys = new HashSet(); final Set remove_keys = new HashSet(); + extra_keys.addAll(extra_keys_param); + extra_keys.addAll(extra_keys_custom); if (extra_keys_subtype != null) { Set present = new HashSet(); @@ -191,8 +193,6 @@ final class Config extra_keys_subtype.compute(extra_keys, new ExtraKeys.Query(kw.script, present)); } - extra_keys.addAll(extra_keys_param); - extra_keys.addAll(extra_keys_custom); boolean number_row = this.number_row && !show_numpad; if (number_row) KeyboardData.number_row.getKeys(remove_keys); -- cgit v1.2.3