From 43ccd439ee90cf795657b9b11ffcb85df64792d4 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Thu, 8 Jan 2026 02:40:09 +0900
Subject: [PATCH] tweak keycaps

---
 wlx-overlay-s/src/assets/gui/keyboard.xml     | 30 ++++++++++++-------
 wlx-overlay-s/src/overlays/keyboard/layout.rs |  6 +++-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/wlx-overlay-s/src/assets/gui/keyboard.xml b/wlx-overlay-s/src/assets/gui/keyboard.xml
index 95513f6d..ef6d2536 100644
--- a/wlx-overlay-s/src/assets/gui/keyboard.xml
+++ b/wlx-overlay-s/src/assets/gui/keyboard.xml
@@ -24,7 +24,7 @@
   <template name="KeySpecial">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect">
-        <sprite color="~color_text" width="21" height="21" src="keyboard/${text}.svg" />
+        <sprite color="~color_text" width="24" height="24" src="keyboard/${text}.svg" />
       </rectangle>
     </div>
   </template>
@@ -34,7 +34,7 @@
   <template name="KeyLetter">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect">
-        <label text="${text}" size="16" />
+        <label text="${text}" size="18" />
       </rectangle>
     </div>
   </template>
@@ -44,8 +44,8 @@
   <template name="KeyLetterAltGr">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect" gap="3">
-        <label text="${text}" size="16" />
-        <label color="~color_text_translucent" text="${text_altgr}" size="16" />
+        <label text="${text}" size="18" />
+        <label color="~color_text_translucent" text="${text_altgr}" size="18" />
       </rectangle>
     </div>
   </template>
@@ -55,8 +55,8 @@
   <template name="KeySymbol">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect" gap="3">
-        <label color="~color_text_translucent" text="${text_shift}" size="16" />
-        <label text="${text}" size="16" />
+        <label color="~color_text_translucent" text="${text_shift}" size="1" />
+        <label text="${text}" size="18" />
       </rectangle>
     </div>
   </template>
@@ -65,21 +65,31 @@
   <!-- Used for number & symbol keys on layouts with AltGr. -->
   <template name="KeySymbolAltGr">
     <div macro="keycap_div">
-      <rectangle id="${id}" macro="keycap_rect" flex_direction="row" flex_wrap="wrap">
+      <rectangle id="${id}" macro="keycap_rect" flex_direction="row" flex_wrap="wrap" padding="4">
         <div width="50%" height="50%" align_items="center" justify_content="center">
-          <label color="~color_text_translucent" text="${text_shift}" size="16" />
+          <label color="~color_text_translucent" text="${text_shift}" size="18" />
         </div>
         <div width="50%" height="50%" align_items="center" justify_content="center" />
         <div width="50%" height="50%" align_items="center" justify_content="center">
-          <label text="${text}" size="16" />
+          <label text="${text}" size="18" />
         </div>
         <div width="50%" height="50%" align_items="center" justify_content="center">
-          <label color="~color_text_translucent" text="${text_altgr}" size="16" />
+          <label color="~color_text_translucent" text="${text_altgr}" size="18" />
         </div>
       </rectangle>
     </div>
   </template>
 
+  <!-- Key cap with a single text line in the middle -->
+  <!-- Used for keys, such as Home, PageUp, etc. -->
+  <template name="KeyOther">
+    <div macro="keycap_div">
+      <rectangle id="${id}" macro="keycap_rect">
+        <label text="${text}" size="16" />
+      </rectangle>
+    </div>
+  </template>
+
   <macro name="button_style" border="2" border_color="~color_accent_translucent" color="~color_bg" round="6"
     align_items="center" justify_content="center" padding="6" width="60" height="60" overflow="visible"/>
 
diff --git a/wlx-overlay-s/src/overlays/keyboard/layout.rs b/wlx-overlay-s/src/overlays/keyboard/layout.rs
index 8b605ace..f210103f 100644
--- a/wlx-overlay-s/src/overlays/keyboard/layout.rs
+++ b/wlx-overlay-s/src/overlays/keyboard/layout.rs
@@ -118,7 +118,9 @@ impl Layout {
                             _ => label.push(format!("{vk:?}").to_lowercase()),
                         }
                     }
-                    KeyType::Other => {}
+                    KeyType::Other => {
+                        cap_type = KeyCapType::Other;
+                    }
                 }
             }
 
@@ -258,4 +260,6 @@ pub enum KeyCapType {
     /// Shift symbol on top-left
     /// AltGr symbol on bottom-right
     SymbolAltGr,
+    /// Label has text in the center, e.g. Home
+    Other,
 }