From 2a1f34a037add3ee2f9bab1ddfa5bc48d364259a Mon Sep 17 00:00:00 2001
From: eshifri <46511024+eshifri@users.noreply.github.com>
Date: Mon, 2 Aug 2021 04:52:19 -0700
Subject: [PATCH] Fix for #529 Allows to exit widget setup screen using touch
 interface. Take 2 (#533)

* Allow touc interface support for widget setup exit

* fix

* Create BACK Button.
---
 radio/src/gui/colorlcd/screen_setup.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index 686d78fd4..83d370094 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -177,6 +177,16 @@ class SetupWidgetsPage: public FormWindow
         auto widget = new SetupWidgetsPageSlot(this, rect, customScreens[customScreenIdx], i);
         if (i == 0) widget->setFocus();
       }
+
+#if defined(HARDWARE_TOUCH)
+      new Button(
+          this, {0, 0, MENU_HEADER_BUTTON_WIDTH, MENU_HEADER_BUTTON_WIDTH},
+          [this]() -> uint8_t {
+            this->deleteLater();
+            return 1;
+          },
+          NO_FOCUS | FORM_NO_BORDER);
+#endif
     }
 
 #if defined(DEBUG_WINDOWS)
@@ -208,7 +218,7 @@ class SetupWidgetsPage: public FormWindow
 #if defined(HARDWARE_TOUCH)
     bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
                       coord_t slideX, coord_t slideY) override
-    {
+    {                     
       FormWindow::onTouchSlide(x, y, startX, startY, slideX, slideY);
       return true;
     }