From 1eea9e25d25afa04f0f98618df07820d27c8fe2e Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 6 Aug 2023 16:58:44 +0200 Subject: Remove the Accents option This option makes less sense since per-script extra keys. It's also getting in the way of an eventual "dead-key or accented-letters" option. --- srcs/juloo.keyboard2/Keyboard2.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'srcs/juloo.keyboard2/Keyboard2.java') diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 51026e1..5f7442b 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -124,20 +124,10 @@ public class Keyboard2 extends InputMethodService { List enabled_subtypes = getEnabledSubtypes(imm); List extra_keys = new ArrayList(); - switch (_config.accents) - { - // '3' was "all accents", now unused - case 1: case 3: - extra_keys.add(extra_keys_of_subtype(subtype)); - for (InputMethodSubtype s : enabled_subtypes) - extra_keys.add(extra_keys_of_subtype(s)); - break; - case 2: - extra_keys.add(extra_keys_of_subtype(subtype)); - break; - case 4: break; - default: throw new IllegalArgumentException(); - } + // Gather extra keys from all enabled subtypes + extra_keys.add(extra_keys_of_subtype(subtype)); + for (InputMethodSubtype s : enabled_subtypes) + extra_keys.add(extra_keys_of_subtype(s)); _config.extra_keys_subtype = ExtraKeys.merge(extra_keys); if (enabled_subtypes.size() > 1) _config.shouldOfferSwitchingToNextInputMethod = true; -- cgit v1.2.3