From efdf76a9f5ee9acbb090a7b0fe35be5b6b84626c Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 23 May 2021 09:04:19 +0200 Subject: [PATCH] Updated libopenui And fix the view main menu issue with this PR. --- radio/src/gui/colorlcd/select_fab_carousel.cpp | 10 +++------- radio/src/thirdparty/libopenui | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/colorlcd/select_fab_carousel.cpp b/radio/src/gui/colorlcd/select_fab_carousel.cpp index 61869d711..e188caab7 100644 --- a/radio/src/gui/colorlcd/select_fab_carousel.cpp +++ b/radio/src/gui/colorlcd/select_fab_carousel.cpp @@ -36,14 +36,10 @@ void SelectFabCarousel::setMaxButtons(uint8_t max) void SelectFabCarousel::addButton(uint8_t icon, const char* title, std::function pressHandler) { - coord_t y_pos = 0;//SELECT_BUTTON_BORDER; - coord_t x_pos = pageWidth * buttons;// + SELECT_BUTTON_BORDER / 2; + coord_t y_pos = 0; + coord_t x_pos = pageWidth * buttons; buttons++; - /*auto button =*/ new SelectFabButton(this, x_pos, y_pos, icon, title, pressHandler); + new SelectFabButton(this, x_pos, y_pos, icon, title, pressHandler); setInnerWidth(pageWidth * buttons); - - // y_pos += button->width() + SELECT_BUTTON_BORDER; - // setHeight(y_pos); - // setInnerHeight(y_pos); } diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 1c558559e..1930a0308 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 1c558559eba805233b1876c43dd8ffb46673191e +Subproject commit 1930a03088dbb155528f0c6cb524e30e93799626