From 941dd87651801452205ba75c43a77e6c8f4d561f Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 25 Apr 2022 12:08:34 +0200
Subject: [PATCH] more focus fixes

---
 radio/src/gui/colorlcd/view_main.h                      | 3 ---
 radio/src/gui/colorlcd/view_main_decoration.cpp         | 8 ++++++++
 radio/src/gui/colorlcd/view_main_decoration.h           | 8 +-------
 radio/src/gui/colorlcd/widgets/widgets_container_impl.h | 2 +-
 radio/src/thirdparty/libopenui                          | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/radio/src/gui/colorlcd/view_main.h b/radio/src/gui/colorlcd/view_main.h
index 8f6253f69..f2c90f6bc 100644
--- a/radio/src/gui/colorlcd/view_main.h
+++ b/radio/src/gui/colorlcd/view_main.h
@@ -90,9 +90,6 @@ class ViewMain: public Window
     // Set topbar visibility [0.0 -> 1.0]
     void setTopbarVisible(float visible);
 
-    // void setScrollPositionX(coord_t value) override;
-    // void setScrollPositionY(coord_t value) override;
-
 #if defined(HARDWARE_TOUCH)
     unsigned char prevSlideState = 0;
     unsigned int  startSlidePage = 0;
diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/view_main_decoration.cpp
index a156eb015..b8bdea292 100644
--- a/radio/src/gui/colorlcd/view_main_decoration.cpp
+++ b/radio/src/gui/colorlcd/view_main_decoration.cpp
@@ -31,6 +31,14 @@
 
 #include "board.h"
 
+ViewMainDecoration::ViewMainDecoration(Window* parent, const rect_t& rect) :
+    Window(parent, rect, NO_FOCUS)
+{
+  createSliders();
+  createTrims();
+  createFlightMode();
+}
+
 void ViewMainDecoration::setSlidersVisible(bool visible)
 {
   //
diff --git a/radio/src/gui/colorlcd/view_main_decoration.h b/radio/src/gui/colorlcd/view_main_decoration.h
index 6edbda7da..5d704cf53 100644
--- a/radio/src/gui/colorlcd/view_main_decoration.h
+++ b/radio/src/gui/colorlcd/view_main_decoration.h
@@ -28,13 +28,7 @@ constexpr coord_t FM_LABEL_HEIGHT = 20;
 class ViewMainDecoration: public Window
 {
   public:
-    ViewMainDecoration(Window * parent, const rect_t & rect):
-        Window(parent, rect)
-    {
-      createSliders();
-      createTrims();
-      createFlightMode();
-    }
+    ViewMainDecoration(Window * parent, const rect_t & rect);
 
     // Set decoration visibility
     void setTrimsVisible(bool visible);
diff --git a/radio/src/gui/colorlcd/widgets/widgets_container_impl.h b/radio/src/gui/colorlcd/widgets/widgets_container_impl.h
index 2535f5e2e..4c8297de7 100644
--- a/radio/src/gui/colorlcd/widgets/widgets_container_impl.h
+++ b/radio/src/gui/colorlcd/widgets/widgets_container_impl.h
@@ -33,7 +33,7 @@ class WidgetsContainerImpl : public WidgetsContainer
 
   WidgetsContainerImpl(Window* parent, const rect_t& rect,
                        PersistentData* persistentData) :
-      WidgetsContainer(parent, rect, FORM_FORWARD_FOCUS),
+      WidgetsContainer(parent, rect, NO_FOCUS | FORM_FORWARD_FOCUS),
       persistentData(persistentData)
   {
   }
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index ebdf27739..d5a887bf9 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit ebdf2773926142be8bcf2e890348d32ebcd85b4c
+Subproject commit d5a887bf9c24e1f4b1eed3d92997faca8a80af90