don't change the numpad layout. thus, the numpad key is not intended …

…for use therein; remove toggle logic from the slide.
Helium314 · Jul 8, 2024 · b952799 · b952799
1 parent 2b0ab0e
commit b952799
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/assets/layouts/numpad.json b/app/src/main/assets/layouts/numpad.json
@@ -39,12 +39,12 @@
     { "label": "delete" }
   ],
   [
-    { "label": "alpha", "width": 0.15 },
+    { "label": "alpha" },
     { "label": "comma", "width":  0.1 },
-    { "label": "numpad", "width": 0.14 },
+    { "label": "symbol", "type": "character", "width":  0.12 },
     { "label": "0", "type": "numeric" },
-    { "label": "=", "type": "function", "width": 0.14, "popup": { "relevant": [ { "label": "≠"}, { "label": "≈"} ] } },
+    { "label": "=", "width":  0.12, "popup": { "relevant": [ { "label": "≠"}, { "label": "≈"} ] } },
     { "label": "period", "width":  0.1 },
-    { "label": "action", "width": 0.15 }
+    { "label": "action" }
   ]
 ]
diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardState.java b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardState.java
@@ -514,9 +514,9 @@ public void onReleaseKey(final int code, final boolean withSliding, final int au
         case KeyCode.SYMBOL -> onReleaseSymbol(withSliding, autoCapsFlags, recapitalizeMode);
         case KeyCode.ALPHA -> onReleaseAlpha(withSliding, autoCapsFlags, recapitalizeMode);
         case KeyCode.NUMPAD -> {
-            // if no sliding, toggling is instead handled by {@link #onEvent} to accomodate toolbar key.
+            // if no sliding, toggling is instead handled by {@link #onEvent} to accommodate toolbar key.
             // also prevent sliding into to the clipboard layout, which isn't supported yet.
-            if (withSliding) toggleNumpad(true, autoCapsFlags, recapitalizeMode, mModeBeforeNumpad == MODE_CLIPBOARD, true);
+            if (withSliding) setNumpadKeyboard(true, mModeBeforeNumpad == MODE_CLIPBOARD, true);
         }}
     }