Use the <fn /> mappings first when typing a gesture (#1085)

This allows assigning mappings to letters without changing the Shift
mappings and making uppercase impossible to type.

For gestures, the Shift modifier is still applied first, unless a custom
mapping for <fn/> is set for the key.

1 files changed, 7 insertions, 0 deletions

diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 18fe2d7..e0705f7 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -368,6 +368,13 @@ public final class KeyModifier
   private static KeyValue apply_gesture(KeyValue k)
   {
     KeyValue modified = apply_shift(k);
+    if (_modmap != null)
+    {
+      modified = _modmap.get(Modmap.M.Fn, k);
+      if (modified != null)
+        return modified;
+    }
+    modified = apply_shift(k);
     if (modified != null && !modified.equals(k))
       return modified;
     modified = apply_fn(k);