feat(color): hide customizable switch screen startup header when not used (#5168)

Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
3djc
2024-06-13 11:27:40 +10:00
committed by GitHub
co-authored by philmoz
parent 9c625faeee
commit 22128df1cd
2 changed files with 29 additions and 20 deletions
+25 -19
View File
@@ -62,7 +62,7 @@ class FunctionSwitch : public Window
new ModelTextEdit(this, {NM_X, 0, NM_W, 32}, new ModelTextEdit(this, {NM_X, 0, NM_W, 32},
g_model.switchNames[switchIndex], LEN_SWITCH_NAME); g_model.switchNames[switchIndex], LEN_SWITCH_NAME);
auto choice = new Choice( typeChoice = new Choice(
this, {TP_X, 0, TP_W, 32}, STR_SWTYPES, SWITCH_NONE, SWITCH_2POS, this, {TP_X, 0, TP_W, 32}, STR_SWTYPES, SWITCH_NONE, SWITCH_2POS,
[=]() { return FSWITCH_CONFIG(switchIndex); }, [=]() { return FSWITCH_CONFIG(switchIndex); },
[=](int val) { [=](int val) {
@@ -73,7 +73,7 @@ class FunctionSwitch : public Window
} }
SET_DIRTY(); SET_DIRTY();
}); });
choice->setAvailableHandler([=](int typ) -> bool { typeChoice->setAvailableHandler([=](int typ) -> bool {
int group = FSWITCH_GROUP(switchIndex); int group = FSWITCH_GROUP(switchIndex);
if (group > 0 && IS_FSWITCH_GROUP_ON(group) && typ == SWITCH_TOGGLE) if (group > 0 && IS_FSWITCH_GROUP_ON(group) && typ == SWITCH_TOGGLE)
return false; return false;
@@ -131,27 +131,24 @@ class FunctionSwitch : public Window
protected: protected:
uint8_t switchIndex; uint8_t switchIndex;
Choice* typeChoice = nullptr;
Choice* groupChoice = nullptr; Choice* groupChoice = nullptr;
Choice* startChoice = nullptr; Choice* startChoice = nullptr;
int lastType = -1;
void setState() void setState()
{ {
if (FSWITCH_CONFIG(switchIndex) != SWITCH_2POS || startChoice->show(FSWITCH_CONFIG(switchIndex) == SWITCH_2POS && FSWITCH_GROUP(switchIndex) == 0);
FSWITCH_GROUP(switchIndex) > 0) { groupChoice->show(FSWITCH_CONFIG(switchIndex) != SWITCH_NONE);
lv_obj_add_flag(startChoice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else {
lv_obj_clear_flag(startChoice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
}
if (FSWITCH_CONFIG(switchIndex) == SWITCH_NONE) {
lv_obj_add_flag(groupChoice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else {
lv_obj_clear_flag(groupChoice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
}
} }
void checkEvents() override void checkEvents() override
{ {
setState(); setState();
if (lastType != FSWITCH_CONFIG(switchIndex)) {
lastType = FSWITCH_CONFIG(switchIndex);
typeChoice->setValue(lastType);
}
Window::checkEvents(); Window::checkEvents();
} }
}; };
@@ -206,6 +203,11 @@ class SwitchGroup : public Window
}); });
} }
void refresh()
{
startChoice->setValue(groupDefaultSwitch(groupIndex) + 1);
}
static constexpr coord_t NM_W = 100; static constexpr coord_t NM_W = 100;
static constexpr coord_t AO_X = NM_W + 2; static constexpr coord_t AO_X = NM_W + 2;
static constexpr coord_t AO_W = 100; static constexpr coord_t AO_W = 100;
@@ -236,7 +238,7 @@ ModelFunctionSwitches::ModelFunctionSwitches() : Page(ICON_MODEL_SETUP)
new StaticText(line, rect_t{}, STR_SWITCH_TYPE, new StaticText(line, rect_t{}, STR_SWITCH_TYPE,
COLOR_THEME_PRIMARY1 | FONT(XS)); COLOR_THEME_PRIMARY1 | FONT(XS));
new StaticText(line, rect_t{}, STR_GROUP, COLOR_THEME_PRIMARY1 | FONT(XS)); new StaticText(line, rect_t{}, STR_GROUP, COLOR_THEME_PRIMARY1 | FONT(XS));
new StaticText(line, rect_t{}, STR_SWITCH_STARTUP, startupHeader = new StaticText(line, rect_t{}, STR_SWITCH_STARTUP,
COLOR_THEME_PRIMARY1 | FONT(XS)); COLOR_THEME_PRIMARY1 | FONT(XS));
for (uint8_t i = 0; i < NUM_FUNCTIONS_SWITCHES; i += 1) { for (uint8_t i = 0; i < NUM_FUNCTIONS_SWITCHES; i += 1) {
@@ -247,6 +249,8 @@ ModelFunctionSwitches::ModelFunctionSwitches() : Page(ICON_MODEL_SETUP)
groupLines[i - 1] = new SwitchGroup(body, i); groupLines[i - 1] = new SwitchGroup(body, i);
} }
setState();
line = body->newLine(grid1); line = body->newLine(grid1);
new StaticText(line, rect_t{}, STR_MORE_INFO, COLOR_THEME_PRIMARY1); new StaticText(line, rect_t{}, STR_MORE_INFO, COLOR_THEME_PRIMARY1);
@@ -264,11 +268,13 @@ ModelFunctionSwitches::ModelFunctionSwitches() : Page(ICON_MODEL_SETUP)
void ModelFunctionSwitches::setState() void ModelFunctionSwitches::setState()
{ {
for (int i = 0; i < 3; i += 1) int cnt = 0;
if (firstSwitchInGroup(i + 1) < 0) for (int i = 0; i < 3; i += 1) {
lv_obj_add_flag(groupLines[i]->getLvObj(), LV_OBJ_FLAG_HIDDEN); cnt += getSwitchCountInFSGroup(i + 1);
else groupLines[i]->show(firstSwitchInGroup(i + 1) >= 0);
lv_obj_clear_flag(groupLines[i]->getLvObj(), LV_OBJ_FLAG_HIDDEN); groupLines[i]->refresh();
}
startupHeader->show(cnt != NUM_FUNCTIONS_SWITCHES);
} }
void ModelFunctionSwitches::checkEvents() void ModelFunctionSwitches::checkEvents()
+4 -1
View File
@@ -25,14 +25,17 @@
#include "page.h" #include "page.h"
class SwitchGroup;
class ModelFunctionSwitches : public Page class ModelFunctionSwitches : public Page
{ {
public: public:
ModelFunctionSwitches(); ModelFunctionSwitches();
protected: protected:
Window* groupLines[3] = {nullptr}; SwitchGroup* groupLines[3] = {nullptr};
BitmapBuffer* qrcode = nullptr; BitmapBuffer* qrcode = nullptr;
StaticText* startupHeader = nullptr;
void setState(); void setState();
void checkEvents() override; void checkEvents() override;