From 2495691c656f2755d4a2fd0538a5b094e9fdba58 Mon Sep 17 00:00:00 2001
From: "kkoenig1@optonline.com" <kkoenig1@optonline.com>
Date: Sat, 8 Jan 2022 04:25:48 -0500
Subject: [PATCH] 1. Included mroe fonts 2. change order of initialization. 
 Lvgl has to be before ViewMain 3. Basic support for layers, but they are
 still broken when Menu's are used 4. Register input driver in lvglwrapper

---
 radio/src/gui/colorlcd/fullscreen_dialog.cpp | 6 +-----
 radio/src/gui/colorlcd/screen_setup.cpp      | 2 +-
 radio/src/gui/colorlcd/topbar.cpp            | 2 +-
 radio/src/thirdparty/libopenui               | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
index 83c8e1332..4a32f447d 100644
--- a/radio/src/gui/colorlcd/fullscreen_dialog.cpp
+++ b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
@@ -25,14 +25,10 @@
 #include "opentx.h"
 #include "libopenui.h"
 
-LvglWidgetFactory fullScreenDialogFactory = LvglWidgetFactory([] (lv_obj_t *parent) {
-  return lv_obj_create(nullptr);
-});
-
 FullScreenDialog::FullScreenDialog(
     uint8_t type, std::string title, std::string message, std::string action,
     const std::function<void(void)>& confirmHandler) :
-    FormGroup(MainWindow::instance(), {0, 0, LCD_W, LCD_H}, OPAQUE, &fullScreenDialogFactory),
+    FormGroup(MainWindow::instance(), {0, 0, LCD_W, LCD_H}, OPAQUE, true),
     type(type),
     title(std::move(title)),
     message(std::move(message)),
diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index 1137caa3e..5a9e49dfb 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -161,7 +161,7 @@ class SetupWidgetsPage: public FormWindow
 {
   public:
     SetupWidgetsPage(ScreenMenu* menu, uint8_t customScreenIdx):
-      FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS),
+      FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS,true),
       menu(menu),
       customScreenIdx(customScreenIdx)
     {
diff --git a/radio/src/gui/colorlcd/topbar.cpp b/radio/src/gui/colorlcd/topbar.cpp
index 63497bc53..03b263203 100644
--- a/radio/src/gui/colorlcd/topbar.cpp
+++ b/radio/src/gui/colorlcd/topbar.cpp
@@ -34,7 +34,7 @@ Topbar * TopbarFactory::create(Window * parent)
 }
 
 SetupTopBarWidgetsPage::SetupTopBarWidgetsPage(ScreenMenu* menu):
-  FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS),
+  FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS, true),
   menu(menu)
 {
   // remember focus
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index f68fb11a2..daeb3f133 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit f68fb11a2358dc8aef6d95aa35f819ac31aac6ff
+Subproject commit daeb3f1330ad6bac33738419ec9c582b79c2e781