From 8639a7829d5a5c15f2208cbf5b18c17d79d01aeb Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Tue, 31 May 2022 10:27:35 +0200
Subject: [PATCH] cleanup & formatting

---
 radio/src/gui/colorlcd/radio_sdmanager.cpp |  1 -
 radio/src/gui/colorlcd/radio_setup.cpp     | 37 ++++++++++++----------
 radio/src/gui/colorlcd/view_main.cpp       |  8 ++---
 radio/src/thirdparty/libopenui             |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp
index a9726fbd5..ae87a5d3c 100644
--- a/radio/src/gui/colorlcd/radio_sdmanager.cpp
+++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp
@@ -117,7 +117,6 @@ class FlashDialog: public FullScreenDialog
       device(device),
       progress(this, {LCD_W / 2 - 50, LCD_H / 2, 100, 15})
     {
-      // setFocus();
     }
 
     void deleteLater(bool detach = true, bool trash = true) override
diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio_setup.cpp
index 52f06b228..f078f0ec0 100644
--- a/radio/src/gui/colorlcd/radio_setup.cpp
+++ b/radio/src/gui/colorlcd/radio_setup.cpp
@@ -160,28 +160,33 @@ class DateTimeWindow : public FormGroup {
     }
 };
 
-class WindowButtonGroup : public FormGroup {
-  public:
-  WindowButtonGroup(FormGroup * parent, const rect_t & rect, std::vector<std::pair<const char*, std::function<void()> >> windows) :
+class WindowButtonGroup : public FormGroup
+{
+ public:
+  WindowButtonGroup(
+      FormGroup* parent, const rect_t& rect,
+      std::vector<std::pair<const char*, std::function<void()>>> windows) :
       FormGroup(parent, rect, FORWARD_SCROLL | FORM_FORWARD_FOCUS),
       windows(windows)
-    {
-      build();
-    }
+  {
+    build();
+  }
 
-  protected:
-    std::vector<std::pair<const char*, std::function<void()> >> windows;
+ protected:
+  std::vector<std::pair<const char*, std::function<void()>>> windows;
 
-    void build()
-    {
-      FormGridLayout grid;
+  void build()
+  {
+    FormGridLayout grid;
 
-      for(auto entry: windows)
-      {
-        new TextButton(this, grid.getLabelSlot(), entry.first, [&, entry](){entry.second(); return 1;});
-        grid.nextLine();
-      }
+    for (auto entry : windows) {
+      new TextButton(this, grid.getLabelSlot(), entry.first, [&, entry]() {
+        entry.second();
+        return 0;
+      });
+      grid.nextLine();
     }
+  }
 };
 
 static const lv_coord_t line_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1),
diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp
index 87a687648..4ea98a28e 100644
--- a/radio/src/gui/colorlcd/view_main.cpp
+++ b/radio/src/gui/colorlcd/view_main.cpp
@@ -259,12 +259,6 @@ void ViewMain::onEvent(event_t event)
       new ScreenMenu();
       break;
 
-    // // do not use KEY_FIRST as it would
-    // // interfere with the menu CLICKED event
-    // case EVT_KEY_FIRST(KEY_ENTER):
-    //   openMenu();
-    //   break;
-
 #if defined(KEYS_GPIO_REG_PGUP)
     case EVT_KEY_FIRST(KEY_PGDN):
 #else
@@ -284,6 +278,8 @@ void ViewMain::onEvent(event_t event)
       previousMainView();
       break;
 
+    // TODO: find something to activate widget selection via keys
+
     // case EVT_ROTARY_LEFT:
     //   // decrement
     // case EVT_ROTARY_RIGHT:
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 1ae025f64..e5398e9b8 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 1ae025f6401f79aa8eb6d5d8e5804a2a2ee60623
+Subproject commit e5398e9b8d72c9bbc862f9e03d32a6d245e474f6