From 72726b054e088a8753f2ceefe680fd22cb36e117 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 23 May 2022 08:56:12 +0200
Subject: [PATCH] widget settings & flight mode trims: set focus after form
 build

---
 radio/src/gui/colorlcd/model_flightmodes.cpp | 3 +++
 radio/src/gui/colorlcd/widget_settings.cpp   | 1 +
 radio/src/thirdparty/libopenui               | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/radio/src/gui/colorlcd/model_flightmodes.cpp b/radio/src/gui/colorlcd/model_flightmodes.cpp
index 6a78cfff1..45c74dccd 100644
--- a/radio/src/gui/colorlcd/model_flightmodes.cpp
+++ b/radio/src/gui/colorlcd/model_flightmodes.cpp
@@ -144,6 +144,7 @@ struct FMTrimSettings : public Dialog {
 
     content->setWidth(LCD_W * 0.8);
     content->updateSize();
+    form->setFocus();
   }
 };
 
@@ -197,6 +198,8 @@ FlightModeEdit::FlightModeEdit(uint8_t index) :
     new FMTrimSettings(this, p_fm);
     return 0;
   });
+
+  form->setFocus();
 }
 
 class FlightModeBtn: public Button
diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/widget_settings.cpp
index dbe956cb8..5b61b3e2f 100644
--- a/radio/src/gui/colorlcd/widget_settings.cpp
+++ b/radio/src/gui/colorlcd/widget_settings.cpp
@@ -171,6 +171,7 @@ WidgetSettings::WidgetSettings(Window* parent, Widget* widget) :
 
   content->updateSize();
   setCloseHandler([=]() { widget->update(); });
+  form->setFocus();
 }
 
 #if defined(HARDWARE_KEYS)
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index d31a31992..21e0147c0 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit d31a31992b942e8d97b0d9b7680eddf4568c8b55
+Subproject commit 21e0147c0a550174349d7e329e6972b94d754503