From cf6169bdef9f58ee737dee02ebeb78a10f0b94b2 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:43:02 +1100
Subject: [PATCH] fix(color): Closing keyboard also closes underlying page
 (#4354)

---
 radio/src/gui/colorlcd/page.cpp               |  5 +---
 radio/src/gui/colorlcd/tabsgroup.cpp          |  2 +-
 .../libopenui/src/keyboard_base.cpp           | 24 +++++++++----------
 .../thirdparty/libopenui/src/keyboard_base.h  |  4 ++--
 .../thirdparty/libopenui/src/modal_window.cpp |  5 +---
 5 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp
index 2d48717bd..175899092 100644
--- a/radio/src/gui/colorlcd/page.cpp
+++ b/radio/src/gui/colorlcd/page.cpp
@@ -93,7 +93,4 @@ void Page::onCancel()
   deleteLater();
 }
 
-void Page::onClicked()
-{
-  Keyboard::hide();
-}
+void Page::onClicked() { Keyboard::hide(false); }
diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp
index 33ada08f8..6acaa1943 100644
--- a/radio/src/gui/colorlcd/tabsgroup.cpp
+++ b/radio/src/gui/colorlcd/tabsgroup.cpp
@@ -277,7 +277,7 @@ void TabsGroup::onPressPGDN()
 }
 #endif
 
-void TabsGroup::onClicked() { Keyboard::hide(); }
+void TabsGroup::onClicked() { Keyboard::hide(false); }
 
 void TabsGroup::onCancel() { deleteLater(); }
 
diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp b/radio/src/thirdparty/libopenui/src/keyboard_base.cpp
index 8620cf470..fff42a70d 100644
--- a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp
+++ b/radio/src/thirdparty/libopenui/src/keyboard_base.cpp
@@ -27,21 +27,18 @@ static void keyboard_event_cb(lv_event_t * e)
 {
   auto code = lv_event_get_code(e);
   if (code == LV_EVENT_READY) {
-    Keyboard::hide();
+    Keyboard::hide(false);
   } else if (code == LV_EVENT_CANCEL) {
-    Keyboard::hide();
+    Keyboard::hide(true);
   } else if (code == LV_EVENT_KEY) {
     int32_t c = *((int32_t *)lv_event_get_param(e));
     if (c == LV_KEY_ESC) {
-      Keyboard::hide();
+      Keyboard::hide(false);
     }
   }
 }
 
-static void field_focus_leave(lv_event_t* e)
-{
-  Keyboard::hide();
-}
+static void field_focus_leave(lv_event_t* e) { Keyboard::hide(false); }
 
 static void _assign_lv_group(lv_group_t* g)
 {
@@ -82,7 +79,7 @@ Keyboard::~Keyboard()
   if (group) lv_group_del(group);
 }
 
-void Keyboard::clearField()
+void Keyboard::clearField(bool wasCancelled)
 {
   TRACE("CLEAR FIELD");
   if (keyboard != nullptr) {
@@ -103,8 +100,9 @@ void Keyboard::clearField()
     if (obj) {
       lv_obj_remove_event_cb(obj, field_focus_leave);
     }
-    
-    field->setEditMode(false);
+
+    if (!wasCancelled)
+      field->setEditMode(false);
     field->changeEnd();
     field = nullptr;
 
@@ -116,10 +114,10 @@ void Keyboard::clearField()
   }
 }
 
-void Keyboard::hide()
+void Keyboard::hide(bool wasCancelled)
 {
   if (activeKeyboard) {
-    activeKeyboard->clearField();
+    activeKeyboard->clearField(wasCancelled);
     lv_obj_add_flag(activeKeyboard->lvobj, LV_OBJ_FLAG_HIDDEN);
     activeKeyboard = nullptr;
   }
@@ -129,7 +127,7 @@ bool Keyboard::attachKeyboard()
 {
   if (activeKeyboard) {
     if (activeKeyboard == this) return false;
-    hide();
+    hide(false);
   }
 
   activeKeyboard = this;
diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.h b/radio/src/thirdparty/libopenui/src/keyboard_base.h
index 3c7e6fccf..f70a5c7d1 100644
--- a/radio/src/thirdparty/libopenui/src/keyboard_base.h
+++ b/radio/src/thirdparty/libopenui/src/keyboard_base.h
@@ -28,8 +28,8 @@ class Keyboard : public Window
   explicit Keyboard(coord_t height);
   ~Keyboard();
 
-  void clearField();
-  static void hide();
+  void clearField(bool wasCancelled);
+  static void hide(bool wasCancelled);
 
  protected:
   static Keyboard *activeKeyboard;
diff --git a/radio/src/thirdparty/libopenui/src/modal_window.cpp b/radio/src/thirdparty/libopenui/src/modal_window.cpp
index 6e11e5e10..51d4ed8bf 100644
--- a/radio/src/thirdparty/libopenui/src/modal_window.cpp
+++ b/radio/src/thirdparty/libopenui/src/modal_window.cpp
@@ -48,10 +48,7 @@ ModalWindowContent::ModalWindowContent(ModalWindow* parent,
 {
 }
 
-void ModalWindowContent::onClicked()
-{
-  Keyboard::hide();
-}
+void ModalWindowContent::onClicked() { Keyboard::hide(false); }
 
 void ModalWindowContent::setTitle(const std::string& text)
 {