fix(color): navigation for Ghost module config tool (#6614)
This commit is contained in:
@@ -50,10 +50,6 @@ class GhostModuleConfigWindow : public Window
|
|||||||
COLOR_THEME_PRIMARY1_INDEX, FONT(L));
|
COLOR_THEME_PRIMARY1_INDEX, FONT(L));
|
||||||
etx_txt_color(menuLines[i][1]->getLvObj(), COLOR_THEME_SECONDARY1_INDEX,
|
etx_txt_color(menuLines[i][1]->getLvObj(), COLOR_THEME_SECONDARY1_INDEX,
|
||||||
LV_PART_MAIN);
|
LV_PART_MAIN);
|
||||||
etx_solid_bg(menuLines[i][1]->getLvObj(), COLOR_THEME_FOCUS_INDEX,
|
|
||||||
LV_STATE_USER_1);
|
|
||||||
etx_txt_color(menuLines[i][1]->getLvObj(), COLOR_THEME_SECONDARY3_INDEX,
|
|
||||||
LV_STATE_USER_1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,29 +64,33 @@ class GhostModuleConfigWindow : public Window
|
|||||||
void checkEvents() override
|
void checkEvents() override
|
||||||
{
|
{
|
||||||
for (uint8_t i = 0; i < GHST_MENU_LINES; i += 1) {
|
for (uint8_t i = 0; i < GHST_MENU_LINES; i += 1) {
|
||||||
if (reusableBuffer.ghostMenu.line[i].splitLine) {
|
menuLines[i][1]->setText("");
|
||||||
menuLines[i][0]->setText(reusableBuffer.ghostMenu.line[i].menuText);
|
|
||||||
if (reusableBuffer.ghostMenu.line[i].lineFlags &
|
|
||||||
GHST_LINE_FLAGS_LABEL_SELECT)
|
|
||||||
lv_obj_add_state(menuLines[i][0]->getLvObj(), LV_STATE_USER_1);
|
|
||||||
|
|
||||||
menuLines[i][1]->setText(reusableBuffer.ghostMenu.line[i].menuText +
|
if (reusableBuffer.ghostMenu.line[i].splitLine) {
|
||||||
reusableBuffer.ghostMenu.line[i].splitLine);
|
if (reusableBuffer.ghostMenu.line[i].lineFlags & (GHST_LINE_FLAGS_LABEL_SELECT | GHST_LINE_FLAGS_VALUE_SELECT)) {
|
||||||
if (reusableBuffer.ghostMenu.line[i].lineFlags &
|
lv_obj_add_state(menuLines[i][0]->getLvObj(), LV_STATE_USER_1);
|
||||||
GHST_LINE_FLAGS_VALUE_SELECT)
|
} else {
|
||||||
lv_obj_add_state(menuLines[i][1]->getLvObj(), LV_STATE_USER_1);
|
lv_obj_clear_state(menuLines[i][0]->getLvObj(), LV_STATE_USER_1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (reusableBuffer.ghostMenu.line[i].lineFlags & GHST_LINE_FLAGS_VALUE_SELECT) {
|
||||||
|
menuLines[i][0]->setText(reusableBuffer.ghostMenu.line[i].menuText +
|
||||||
|
reusableBuffer.ghostMenu.line[i].splitLine);
|
||||||
|
} else {
|
||||||
|
menuLines[i][0]->setText(reusableBuffer.ghostMenu.line[i].menuText);
|
||||||
|
menuLines[i][1]->setText(reusableBuffer.ghostMenu.line[i].menuText +
|
||||||
|
reusableBuffer.ghostMenu.line[i].splitLine);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (reusableBuffer.ghostMenu.line[i].lineFlags &
|
if (reusableBuffer.ghostMenu.line[i].lineFlags & GHST_LINE_FLAGS_VALUE_EDIT && BLINK_ON_PHASE)
|
||||||
GHST_LINE_FLAGS_VALUE_EDIT &&
|
|
||||||
BLINK_ON_PHASE)
|
|
||||||
menuLines[i][0]->setText("");
|
menuLines[i][0]->setText("");
|
||||||
else
|
else
|
||||||
menuLines[i][0]->setText(reusableBuffer.ghostMenu.line[i].menuText);
|
menuLines[i][0]->setText(reusableBuffer.ghostMenu.line[i].menuText);
|
||||||
if (reusableBuffer.ghostMenu.line[i].lineFlags &
|
|
||||||
GHST_LINE_FLAGS_LABEL_SELECT)
|
|
||||||
lv_obj_add_state(menuLines[i][0]->getLvObj(), LV_STATE_USER_1);
|
|
||||||
|
|
||||||
menuLines[i][1]->setText("");
|
if (reusableBuffer.ghostMenu.line[i].lineFlags & GHST_LINE_FLAGS_LABEL_SELECT)
|
||||||
|
lv_obj_add_state(menuLines[i][0]->getLvObj(), LV_STATE_USER_1);
|
||||||
|
else
|
||||||
|
lv_obj_clear_state(menuLines[i][0]->getLvObj(), LV_STATE_USER_1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user