From b85b67c2f03d1dd1ed96f8352c06e5e23fcbccfe Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 3 Apr 2022 12:48:29 +0200
Subject: Swap Ctrl and switch_numeric keys

The switch_numeric key is generally more important, especially in the
numeric pane.
---
 res/xml/bottom_row.xml             | 2 +-
 res/xml/numeric.xml                | 2 +-
 srcs/juloo.keyboard2/KeyValue.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
index 5e8f176..3602605 100644
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <row height="0.95">
-  <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
+  <key width="1.8" key0="switch_numeric" key2="meta" key4="ctrl"/>
   <key width="1.2" key0="fn" key1="alt" key2="change_method" key3="switch_emoji" key4="config"/>
   <key width="4.0" key0="space"/>
   <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index 2ded41c..0b7ef49 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -26,7 +26,7 @@
     <key width="1.15" key0="backspace" key2="delete"/>
   </row>
   <row height="0.95">
-    <key width="1.5" key0="ctrl" key3="switch_text"/>
+    <key width="1.5" key0="switch_text" key4="ctrl"/>
     <key width="1.5" key0="0"/>
     <key width="0.75" key0="." key1=":" key2="," key3="f11_placeholder"/>
     <key width="0.75" key0="space" key1="&quot;" key2="'" key3="f12_placeholder" key4="_"/>
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index a8a8197..caca85e 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -234,8 +234,8 @@ class KeyValue
     addCharKey('£', EVENT_NONE, FLAG_LOCALIZED);
 
     addSpecialKey("config", "\u0004", EVENT_CONFIG, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
-    addSpecialKey("switch_text", "ABC", EVENT_SWITCH_TEXT);
-    addSpecialKey("switch_numeric", "123+", EVENT_SWITCH_NUMERIC);
+    addSpecialKey("switch_text", "ABC", EVENT_SWITCH_TEXT | FLAG_SMALLER_FONT);
+    addSpecialKey("switch_numeric", "123+", EVENT_SWITCH_NUMERIC | FLAG_SMALLER_FONT);
     addSpecialKey("switch_emoji", "\u0001" , EVENT_SWITCH_EMOJI, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
     addSpecialKey("switch_back_emoji", "ABC", EVENT_SWITCH_BACK_EMOJI);
     addSpecialKey("change_method", "\u0009", EVENT_CHANGE_METHOD, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
-- 
cgit v1.2.3