From ca5b6a121c35aae2c5a110504f3d1534b7562adb Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 26 Jan 2022 12:22:00 +0100
Subject: [PATCH] Do not use lv_obj_create(nullptr)

---
 .../thirdparty/libopenui/src/modal_window.cpp    |  6 +-----
 radio/src/thirdparty/libopenui/src/window.cpp    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/modal_window.cpp b/radio/src/thirdparty/libopenui/src/modal_window.cpp
index 37c9ec9b6..b33983164 100644
--- a/radio/src/thirdparty/libopenui/src/modal_window.cpp
+++ b/radio/src/thirdparty/libopenui/src/modal_window.cpp
@@ -22,12 +22,8 @@
 #include "font.h"
 #include "layer.h"
 
-LvglWidgetFactory modalFactory = LvglWidgetFactory([] (lv_obj_t *parent) {
-  return lv_obj_create(nullptr);
-});
-
 ModalWindow::ModalWindow(Window * parent, bool closeWhenClickOutside):
-  Window(parent->getFullScreenWindow(), {0, 0, LCD_W, LCD_H}, 0, 0, &modalFactory),
+  Window(parent->getFullScreenWindow(), {0, 0, LCD_W, LCD_H}),
   closeWhenClickOutside(closeWhenClickOutside)
 {
   Layer::push(this);
diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index 234ac60cc..c5b585c53 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -118,20 +118,20 @@ LvglWidgetFactory windowFactory = LvglWidgetFactory(
     lv_style_set_radius(&factory->style, 0);
   });
 
-Window::Window(Window * parent, const rect_t & rect, WindowFlags windowFlags, LcdFlags textFlags, LvglWidgetFactory *factory) :
-  parent(parent),
-  rect(rect),
-  innerWidth(rect.w),
-  innerHeight(rect.h),
-  windowFlags(windowFlags),
-  textFlags(textFlags)
+Window::Window(Window *parent, const rect_t &rect, WindowFlags windowFlags,
+               LcdFlags textFlags, LvglWidgetFactory *factory) :
+    parent(parent),
+    rect(rect),
+    innerWidth(rect.w),
+    innerHeight(rect.h),
+    windowFlags(windowFlags),
+    textFlags(textFlags)
 {
   lv_obj_t *lvParent = parent != nullptr ? parent->lvobj : nullptr;
   lvobj = (factory == nullptr) ?
     windowFactory.construct(lvParent) :
     factory->construct(lvParent);
 
-
   lv_obj_add_style(lvobj, &windowFactory.style, LV_PART_MAIN);
   lv_obj_set_pos(lvobj, rect.x, rect.y);
   lv_obj_set_size(lvobj, rect.w, rect.h);