From 98e231c9d4a73d12a0126f0a81ecd2df9728baac Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 26 Jan 2022 12:22:28 +0100
Subject: [PATCH] Fixes for some pop-ups and sliding main views

---
 radio/src/gui/colorlcd/fullscreen_dialog.cpp |  6 +---
 radio/src/gui/colorlcd/page.cpp              |  4 +--
 radio/src/gui/colorlcd/view_main.cpp         | 37 +++++++++++++-------
 radio/src/thirdparty/libopenui               |  2 +-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
index ac79f18b7..e101bd377 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),
     type(type),
     title(std::move(title)),
     message(std::move(message)),
diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp
index 415ed0014..b3baec27a 100644
--- a/radio/src/gui/colorlcd/page.cpp
+++ b/radio/src/gui/colorlcd/page.cpp
@@ -45,9 +45,7 @@ void PageHeader::paint(BitmapBuffer * dc)
 }
 
 
-LvglWidgetFactory pageFactory = LvglWidgetFactory([] (lv_obj_t * parent) {
-    return lv_obj_create(nullptr);
-});
+static LvglWidgetFactory pageFactory = {lv_obj_create, nullptr};
 
 Page::Page(unsigned icon):
   Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H}, OPAQUE, 0, &pageFactory),
diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp
index 939a89030..ba99abc27 100644
--- a/radio/src/gui/colorlcd/view_main.cpp
+++ b/radio/src/gui/colorlcd/view_main.cpp
@@ -29,11 +29,18 @@
 
 #include "opentx.h"
 
+static void tile_event_cb(lv_event_t* e)
+{
+  auto code = lv_event_get_code(e);
+  if (code == LV_EVENT_DRAW_MAIN) {
+    TRACE("DRAW_MAIN tile[%d]", lv_event_get_user_data(e));
+  }
+}
+
 ViewMain * ViewMain::_instance = nullptr;
 
 ViewMain::ViewMain():
-  Window(MainWindow::instance(), MainWindow::instance()->getRect(), NO_SCROLLBAR),
-  topbar(dynamic_cast<TopbarImpl*>(TopbarFactory::create(this)))
+  Window(MainWindow::instance(), MainWindow::instance()->getRect(), NO_SCROLLBAR)
 {
   setPageWidth(getParent()->width());
   focusWindow = this;
@@ -46,13 +53,15 @@ ViewMain::ViewMain():
   tile_view = lv_tileview_create(lvobj);
   lv_obj_set_pos(tile_view, rect.x, rect.y);
   lv_obj_set_size(tile_view, rect.w, rect.h);
-  lv_obj_set_scrollbar_mode(tile_view, LV_SCROLLBAR_MODE_OFF);
-  lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_SCROLL_ELASTIC);
-  lv_obj_set_user_data(tile_view, this);
-
   lv_obj_set_style_bg_opa(tile_view, LV_OPA_TRANSP, LV_PART_MAIN);
+  lv_obj_set_scrollbar_mode(tile_view, LV_SCROLLBAR_MODE_OFF);
+  lv_obj_clear_flag(tile_view, LV_OBJ_FLAG_SCROLL_ELASTIC);
+
+  lv_obj_add_flag(tile_view, LV_OBJ_FLAG_EVENT_BUBBLE);
+  lv_obj_set_user_data(tile_view, this);
   
-  lv_obj_move_foreground(topbar->getLvObj());
+  // create last to be on top
+  topbar = dynamic_cast<TopbarImpl*>(TopbarFactory::create(this));
 }
 
 ViewMain::~ViewMain()
@@ -62,13 +71,15 @@ ViewMain::~ViewMain()
 
 void ViewMain::addMainView(Window* view, uint32_t viewId)
 {
-  auto tile = lv_tileview_add_tile(tile_view, viewId, 0, LV_DIR_LEFT | LV_DIR_RIGHT);
-  lv_obj_set_user_data(tile, view);
-
-  view->setLeft(lv_obj_get_x(tile));
-  view->setTop(lv_obj_get_y(tile));
-
   TRACE("addMainView(0x%p, %d)", view, viewId);
+
+  auto tile = lv_tileview_add_tile(tile_view, viewId, 0, LV_DIR_LEFT | LV_DIR_RIGHT);
+
+  lv_obj_set_parent(view->getLvObj(), tile);
+  lv_obj_add_event_cb(tile, tile_event_cb, LV_EVENT_ALL, (void*)(unsigned long)viewId);
+
+  setInnerWidth(pageWidth * getMainViewsCount());
+  view->setLeft(pageWidth * viewId);
 }
 
 void ViewMain::setTopbarVisible(float visible)
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index ff581d75f..2fb7c8f34 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit ff581d75fcb57a0099d1b671708af5e785de8724
+Subproject commit 2fb7c8f34244170c2699134c8f98b1dd892e3eb0