From 71e3fd718342bfac57ee05c1e81518faf81aad94 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Sat, 17 May 2025 02:43:03 +0800
Subject: [PATCH] system/ui: use icon for special characters (#35248)

* use icon for special characters

* add icon for SHIFT_DOWN_KEY
---
 system/ui/lib/button.py       | 46 ++++++++++++++++++++++++++---------
 system/ui/widgets/keyboard.py | 14 ++++++++++-
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/system/ui/lib/button.py b/system/ui/lib/button.py
index dfe75d88bd..2d58aee640 100644
--- a/system/ui/lib/button.py
+++ b/system/ui/lib/button.py
@@ -16,6 +16,7 @@ class TextAlignment(IntEnum):
   RIGHT = 2
 
 
+ICON_PADDING = 15
 DEFAULT_BUTTON_FONT_SIZE = 60
 BUTTON_ENABLED_TEXT_COLOR = rl.Color(228, 228, 228, 255)
 BUTTON_DISABLED_TEXT_COLOR = rl.Color(228, 228, 228, 51)
@@ -46,6 +47,7 @@ def gui_button(
   border_radius: int = 10,  # Corner rounding in pixels
   text_alignment: TextAlignment = TextAlignment.CENTER,
   text_padding: int = 20,  # Padding for left/right alignment
+  icon = None,
 ) -> int:
   result = 0
 
@@ -68,20 +70,42 @@ def gui_button(
     rl.draw_rectangle_rounded(rect, roundness, 20, rl.BLACK)
     rl.draw_rectangle_rounded_lines_ex(rect, roundness, 20, 2, rl.WHITE)
 
+  # Handle icon and text positioning
   font = gui_app.font(font_weight)
   text_size = rl.measure_text_ex(font, text, font_size, 0)
   text_pos = rl.Vector2(0, rect.y + (rect.height - text_size.y) // 2)  # Vertical centering
 
-  # Horizontal alignment
-  if text_alignment == TextAlignment.LEFT:
-    text_pos.x = rect.x + text_padding
-  elif text_alignment == TextAlignment.CENTER:
-    text_pos.x = rect.x + (rect.width - text_size.x) // 2
-  elif text_alignment == TextAlignment.RIGHT:
-    text_pos.x = rect.x + rect.width - text_size.x - text_padding
-
-  # Draw the button text
-  text_color = BUTTON_ENABLED_TEXT_COLOR if is_enabled else BUTTON_DISABLED_TEXT_COLOR
-  rl.draw_text_ex(font, text, text_pos, font_size, 0, text_color)
+  # Draw icon if provided
+  if icon:
+    icon_y = rect.y + (rect.height - icon.height) / 2
+    if text:
+      if text_alignment == TextAlignment.LEFT:
+        icon_x = rect.x + text_padding
+        text_pos.x = icon_x + icon.width + ICON_PADDING
+      elif text_alignment == TextAlignment.CENTER:
+        total_width = icon.width + ICON_PADDING + text_size.x
+        icon_x = rect.x + (rect.width - total_width) / 2
+        text_pos.x = icon_x + icon.width + ICON_PADDING
+      else:  # RIGHT
+        text_pos.x = rect.x + rect.width - text_size.x - text_padding
+        icon_x = text_pos.x - ICON_PADDING - icon.width
+    else:
+      # Center icon when no text
+      icon_x = rect.x + (rect.width - icon.width) / 2
+
+    rl.draw_texture_v(icon, rl.Vector2(icon_x, icon_y), rl.WHITE if is_enabled else rl.Color(255, 255, 255, 100))
+  else:
+    # No icon, position text normally
+    if text_alignment == TextAlignment.LEFT:
+      text_pos.x = rect.x + text_padding
+    elif text_alignment == TextAlignment.CENTER:
+      text_pos.x = rect.x + (rect.width - text_size.x) // 2
+    elif text_alignment == TextAlignment.RIGHT:
+      text_pos.x = rect.x + rect.width - text_size.x - text_padding
+
+  # Draw the button text if any
+  if text:
+    text_color = BUTTON_ENABLED_TEXT_COLOR if is_enabled else BUTTON_DISABLED_TEXT_COLOR
+    rl.draw_text_ex(font, text, text_pos, font_size, 0, text_color)
 
   return result
diff --git a/system/ui/widgets/keyboard.py b/system/ui/widgets/keyboard.py
index 37580f80e5..aabd664171 100644
--- a/system/ui/widgets/keyboard.py
+++ b/system/ui/widgets/keyboard.py
@@ -55,6 +55,11 @@ class Keyboard:
 
     self._eye_open_texture = gui_app.texture("icons/eye_open.png", 81, 54)
     self._eye_closed_texture = gui_app.texture("icons/eye_closed.png", 81, 54)
+    self._key_icons = {
+      BACKSPACE_KEY: gui_app.texture("icons/backspace.png", 60, 60),
+      SHIFT_KEY: gui_app.texture("icons/shift.png", 60, 60),
+      SHIFT_DOWN_KEY: gui_app.texture("icons/arrow-down.png", 60, 60),
+    }
 
   @property
   def text(self):
@@ -95,7 +100,14 @@ class Keyboard:
         start_x += new_width
 
         is_enabled = key != ENTER_KEY or len(self._input_box.text) >= self._min_text_size
-        if gui_button(key_rect, key, is_enabled=is_enabled):
+        result = -1
+        if key in self._key_icons:
+          texture = self._key_icons[key]
+          result = gui_button(key_rect, "", icon=texture, is_enabled=is_enabled)
+        else:
+          result = gui_button(key_rect, key, is_enabled=is_enabled)
+
+        if result:
           if key == ENTER_KEY:
             return 1
           else: