feat(color): allow changing the size of topbar widgets (#5235)

This commit is contained in:
philmoz
2024-07-27 16:06:48 +10:00
committed by GitHub
parent 3d8854abdf
commit faf0027818
40 changed files with 185 additions and 65 deletions
+14 -13
View File
@@ -50,24 +50,25 @@ TopBar::TopBar(Window * parent) :
unsigned int TopBar::getZonesCount() const
{
return MAX_TOPBAR_ZONES;
unsigned int zoneCount = 0;
for (int i = 0; i < MAX_TOPBAR_ZONES; i += 1)
if (g_model.topbarWidgetWidth[i] > 0)
zoneCount += 1;
return zoneCount;
}
rect_t TopBar::getZone(unsigned int index) const
{
#if PORTRAIT_LCD
if (index == MAX_TOPBAR_ZONES - 1) {
coord_t size = LCD_W - HDR_DATE_XO - (MAX_TOPBAR_ZONES - 1) * (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN);
return {LCD_W - size, TOPBAR_ZONE_VMARGIN, size, TOPBAR_ZONE_HEIGHT};
}
#endif
coord_t x = MENU_HEADER_BUTTONS_LEFT + 1;
return {
coord_t(MENU_HEADER_BUTTONS_LEFT + 1 + (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN) * index),
TOPBAR_ZONE_VMARGIN,
TOPBAR_ZONE_WIDTH,
TOPBAR_ZONE_HEIGHT
};
for (int i = 0; i < index; i += 1)
x += (g_model.topbarWidgetWidth[i] * (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN));
coord_t size = ((g_model.topbarWidgetWidth[index] - 1) * (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN) + TOPBAR_ZONE_WIDTH);
if ((x + size) > LCD_W) size = LCD_W - x;
return {x, TOPBAR_ZONE_VMARGIN, size, TOPBAR_ZONE_HEIGHT};
}
void TopBar::setVisible(float visible) // 0.0 -> 1.0
@@ -24,6 +24,8 @@
#include "file_preview.h"
#include "menu_screen.h"
#include "theme_manager.h"
#include "topbar_impl.h"
#include "view_main.h"
#if !PORTRAIT_LCD // landscape
@@ -146,12 +148,64 @@ void ScreenUserInterfacePage::build(Window* window)
auto line = window->newLine(grid);
new StaticText(line, rect_t{}, STR_TOP_BAR);
auto setupTopbarWidgets = new TextButton(line, rect_t{}, STR_SETUP_WIDGETS);
setupTopbarWidgets->setPressHandler([=]() -> uint8_t {
menu->deleteLater();
new SetupTopBarWidgetsPage();
return 0;
});
auto setupTopbarWidgets = new TextButton(line, rect_t{}, STR_SETUP_WIDGETS,
[=]() -> uint8_t {
menu->deleteLater();
new SetupTopBarWidgetsPage();
return 0;
});
line = window->newLine(grid);
new StaticText(line, rect_t{}, STR_WIDGET_SIZE);
line = window->newLine(grid);
auto box = new Window(line, rect_t{});
box->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_TINY);
box->padAll(PAD_TINY);
box->padLeft(PAD_MEDIUM);
for (int i = 0; i < MAX_TOPBAR_ZONES; i += 1) {
coord_t w = (g_model.topbarWidgetWidth[i] * (WWBTN_W + PAD_TINY)) - PAD_TINY;
if (w < WWBTN_W) w = WWBTN_W;
widths[i] = new Choice(box, {0, 0, w, 0}, 0, MAX_TOPBAR_ZONES,
[=]() {
return g_model.topbarWidgetWidth[i];
},
[=](int value) {
g_model.topbarWidgetWidth[i] = value;
coord_t w = (g_model.topbarWidgetWidth[i] * (WWBTN_W + PAD_TINY)) - PAD_TINY;
widths[i]->setWidth(w);
int remaining = MAX_TOPBAR_ZONES;
for (int n = 0; n < MAX_TOPBAR_ZONES; n += 1) {
if (n > i) {
if (remaining > 0) {
if (g_model.topbarWidgetWidth[n] == 0) {
g_model.topbarWidgetWidth[n] = 1;
widths[n]->setWidth(WWBTN_W);
widths[n]->show();
widths[n]->update();
}
} else {
if (g_model.topbarWidgetWidth[n] != 0) {
g_model.topbarWidgetWidth[n] = 0;
widths[n]->setWidth(WWBTN_W);
widths[n]->hide();
ViewMain::instance()->getTopbar()->removeWidget(n);
}
}
}
ViewMain::instance()->getTopbar()->load();
remaining -= g_model.topbarWidgetWidth[n];
}
storageDirty(EE_MODEL);
}, STR_WIDGET_SIZE);
widths[i]->setAvailableHandler([=](int value) {
int remaining = MAX_TOPBAR_ZONES;
for (int n = 0; n < i; n += 1)
remaining -= g_model.topbarWidgetWidth[n];
return value > 0 && value <= remaining;
});
if (g_model.topbarWidgetWidth[i] == 0)
widths[i]->hide();
}
// Theme choice
line = window->newLine(grid);
@@ -22,9 +22,11 @@
#pragma once
#include "tabsgroup.h"
#include "widgets_container.h"
class ScreenMenu;
class ThemeView;
class Choice;
class ScreenUserInterfacePage : public PageTab
{
@@ -33,7 +35,10 @@ class ScreenUserInterfacePage : public PageTab
void build(Window* window) override;
static LAYOUT_VAL(WWBTN_W, 60, 60)
protected:
ScreenMenu* menu;
Choice* widths[MAX_TOPBAR_ZONES];
ThemeView* themeView = nullptr;
};