fix(color): ensure backlight ON & OFF sliders always visible (#6865)

This commit is contained in:
philmoz
2025-12-13 12:24:35 +10:00
committed by GitHub
parent fb53b369d2
commit 781a5a7bcc
+9 -29
View File
@@ -449,7 +449,7 @@ class BacklightPage : public SubPage
}); });
// Backlight ON bright // Backlight ON bright
backlightOnBright = setupLine(STR_BLONBRIGHTNESS, [=](Window* parent, coord_t x, coord_t y) { setupLine(STR_BLONBRIGHTNESS, [=](Window* parent, coord_t x, coord_t y) {
backlightOnSlider = new Slider( backlightOnSlider = new Slider(
parent, lv_pct(50), BACKLIGHT_LEVEL_MIN, BACKLIGHT_LEVEL_MAX, parent, lv_pct(50), BACKLIGHT_LEVEL_MIN, BACKLIGHT_LEVEL_MAX,
[=]() -> int32_t { [=]() -> int32_t {
@@ -470,7 +470,7 @@ class BacklightPage : public SubPage
}); });
// Backlight OFF bright // Backlight OFF bright
backlightOffBright = setupLine(STR_BLOFFBRIGHTNESS, [=](Window* parent, coord_t x, coord_t y) { setupLine(STR_BLOFFBRIGHTNESS, [=](Window* parent, coord_t x, coord_t y) {
backlightOffSlider = new Slider( backlightOffSlider = new Slider(
parent, lv_pct(50), BACKLIGHT_LEVEL_MIN, parent, lv_pct(50), BACKLIGHT_LEVEL_MIN,
BACKLIGHT_LEVEL_MAX, GET_DEFAULT(g_eeGeneral.blOffBright), BACKLIGHT_LEVEL_MAX, GET_DEFAULT(g_eeGeneral.blOffBright),
@@ -508,38 +508,18 @@ class BacklightPage : public SubPage
protected: protected:
Window* backlightTimeout = nullptr; Window* backlightTimeout = nullptr;
Window* backlightOnBright = nullptr;
Window* backlightOffBright = nullptr;
Slider* backlightOffSlider = nullptr; Slider* backlightOffSlider = nullptr;
Slider* backlightOnSlider = nullptr; Slider* backlightOnSlider = nullptr;
void updateBacklightControls() void updateBacklightControls()
{ {
switch (g_eeGeneral.backlightMode) { int32_t onBright = BACKLIGHT_LEVEL_MAX - g_eeGeneral.backlightBright;
case e_backlight_mode_off: if (onBright < g_eeGeneral.blOffBright)
backlightTimeout->hide(); g_eeGeneral.backlightBright =
backlightOnBright->hide(); BACKLIGHT_LEVEL_MAX - g_eeGeneral.blOffBright;
backlightOffBright->show();
break; backlightTimeout->show(g_eeGeneral.backlightMode != e_backlight_mode_on);
case e_backlight_mode_keys:
case e_backlight_mode_sticks:
case e_backlight_mode_all:
default: {
backlightTimeout->show();
backlightOnBright->show();
backlightOffBright->show();
int32_t onBright = BACKLIGHT_LEVEL_MAX - g_eeGeneral.backlightBright;
if (onBright < g_eeGeneral.blOffBright)
g_eeGeneral.backlightBright =
BACKLIGHT_LEVEL_MAX - g_eeGeneral.blOffBright;
break;
}
case e_backlight_mode_on:
backlightTimeout->hide();
backlightOnBright->show();
backlightOffBright->hide();
break;
}
resetBacklightTimeout(); resetBacklightTimeout();
} }
}; };