From 1809e6e5895f2ae68b2344ebd804b39ca15fac46 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 28 Sep 2024 16:30:45 +0200 Subject: [PATCH] Allow complex keys in custom extra keys prefs --- srcs/juloo.keyboard2/KeyValue.java | 2 +- srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 22f5a79..8adacf0 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -454,7 +454,7 @@ public final class KeyValue implements Comparable return new KeyValue("", Kind.Modifier, mod.ordinal(), 0); } - private static KeyValue parseKeyDefinition(String str) + public static KeyValue parseKeyDefinition(String str) { if (str.length() < 2 || str.charAt(0) != ':') return makeStringKey(str); diff --git a/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java index cf47d46..fda07ec 100644 --- a/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java +++ b/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java @@ -40,7 +40,7 @@ public class CustomExtraKeysPreference extends ListGroupPreference if (key_names != null) { for (String key_name : key_names) - kvs.put(KeyValue.makeStringKey(key_name), KeyboardData.PreferredPos.DEFAULT); + kvs.put(KeyValue.parseKeyDefinition(key_name), KeyboardData.PreferredPos.DEFAULT); } return kvs; }