From 96cdb2e9e06319814810a8df69223173baa6fae7 Mon Sep 17 00:00:00 2001
From: Mark Thompson <129641948+NotherNgineer@users.noreply.github.com>
Date: Tue, 1 Aug 2023 14:25:26 -0500
Subject: [PATCH] Keyboard tweaks (#1338)

* Disallow 1-time shift in digits/symbols mode

* Slightly wider "123" button and smaller OK button

* Slightly wider "123" button and smaller OK button
---
 firmware/application/ui/ui_alphanum.cpp  | 5 ++++-
 firmware/application/ui/ui_alphanum.hpp  | 2 +-
 firmware/application/ui/ui_textentry.hpp | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/firmware/application/ui/ui_alphanum.cpp b/firmware/application/ui/ui_alphanum.cpp
index e54d92cf..fb116c75 100644
--- a/firmware/application/ui/ui_alphanum.cpp
+++ b/firmware/application/ui/ui_alphanum.cpp
@@ -53,7 +53,10 @@ AlphanumView::AlphanumView(
     button_shift.on_select = [this]() {
         incr(shift_mode);
 
-        if (shift_mode > ShiftMode::ShiftLock)
+        // Disallow one-time shift in digits/symbols mode
+        if ((mode == 1) && (shift_mode == ShiftMode::Shift))
+            shift_mode = ShiftMode::ShiftLock;
+        else if (shift_mode > ShiftMode::ShiftLock)
             shift_mode = ShiftMode::None;
 
         refresh_keys();
diff --git a/firmware/application/ui/ui_alphanum.hpp b/firmware/application/ui/ui_alphanum.hpp
index 21ab8ac4..feb1eb20 100644
--- a/firmware/application/ui/ui_alphanum.hpp
+++ b/firmware/application/ui/ui_alphanum.hpp
@@ -104,7 +104,7 @@ class AlphanumView : public TextEntryView {
         "<DEL"};
 
     Button button_mode{
-        {16 * 8, 32 * 8 - 3, 5 * 8, 3 * 16 + 3},
+        {16 * 8, 32 * 8 - 3, 6 * 8, 3 * 16 + 3},
         ""};
 };
 
diff --git a/firmware/application/ui/ui_textentry.hpp b/firmware/application/ui/ui_textentry.hpp
index 4421991d..2a3e1a76 100644
--- a/firmware/application/ui/ui_textentry.hpp
+++ b/firmware/application/ui/ui_textentry.hpp
@@ -50,7 +50,7 @@ class TextEntryView : public View {
 
     TextEdit text_input;
     Button button_ok{
-        {21 * 8, 32 * 8 - 3, 9 * 8, 3 * 16 + 3},
+        {22 * 8, 32 * 8 - 3, 8 * 8, 3 * 16 + 3},
         "OK"};
 };