piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): Fix inputs and mixes scroll order (#3785)

Browse Source 
* Fix scroll order when adding new inputs and mixes.

* Set focus to first input/mix line, if one exists. Otherwise set focus to '+' button.
This commit is contained in:
philmoz
2023-07-11 10:18:13 +10:00
committed by GitHub
parent ec5ab0b87c
commit b0e64c8d6d
2 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_inputs.cpp
+14 -8
View File
@@ -454,9 +454,18 @@ void ModelInputsPage::build(FormWindow *window)
form = new FormWindow(window, rect_t{});
form->setFlexLayout(LV_FLEX_FLOW_COLUMN, 3);
auto btn = new TextButton(window, rect_t{}, LV_SYMBOL_PLUS, [=]() {
newInput();
return 0;
});
auto btn_obj = btn->getLvObj();
lv_obj_set_width(btn_obj, lv_pct(100));
lv_group_focus_obj(btn_obj);
groups.clear();
lines.clear();
bool focusSet = false;
uint8_t index = 0;
ExpoData* line = g_model.expoData;
for (uint8_t input = 0; input < MAX_INPUTS; input++) {
@@ -469,7 +478,11 @@ void ModelInputsPage::build(FormWindow *window)
groups.emplace_back(group);
while (index < MAX_EXPOS && line->chn == input && EXPO_VALID(line)) {
// one button per input line
createLineButton(group, index);
auto btn = createLineButton(group, index);
if (!focusSet) {
focusSet = true;
lv_group_focus_obj(btn->getLvObj());
}
++index;
++line;
}
@@ -480,12 +493,5 @@ void ModelInputsPage::build(FormWindow *window)
break;
}
}
auto btn = new TextButton(window, rect_t{}, LV_SYMBOL_PLUS, [=]() {
newInput();
return 0;
});
auto btn_obj = btn->getLvObj();
lv_obj_set_width(btn_obj, lv_pct(100));
}
radio/src/gui/colorlcd/model_mixes.cpp
+32 -26
View File
@@ -523,32 +523,7 @@ void ModelMixesPage::build(FormWindow * window)
form = new FormWindow(window, rect_t{});
form->setFlexLayout(LV_FLEX_FLOW_COLUMN, 3);
groups.clear();
lines.clear();
uint8_t index = 0;
MixData* line = g_model.mixData;
for (uint8_t ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++) {
if (index >= MAX_MIXERS) break;
bool skip_mix = (ch == 0 && is_memclear(line, sizeof(MixData)));
if (line->destCh == ch && !skip_mix) {
// one group for the complete mixer channel
auto group = createGroup(form, MIXSRC_FIRST_CH + ch);
groups.emplace_back(group);
while (index < MAX_MIXERS && (line->destCh == ch) && !skip_mix) {
// one button per input line
createLineButton(group, index);
++index;
++line;
skip_mix = (ch == 0 && is_memclear(line, sizeof(MixData)));
}
}
}
auto box = new FormGroup(window, rect_t{});
auto box = new FormWindow(window, rect_t{});
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8));
box->padLeft(lv_dpx(8));
@@ -567,6 +542,37 @@ void ModelMixesPage::build(FormWindow * window)
});
auto btn_obj = btn->getLvObj();
lv_obj_set_width(btn_obj, lv_pct(100));
lv_group_focus_obj(btn_obj);
groups.clear();
lines.clear();
bool focusSet = false;
uint8_t index = 0;
MixData* line = g_model.mixData;
for (uint8_t ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++) {
if (index >= MAX_MIXERS) break;
bool skip_mix = (ch == 0 && is_memclear(line, sizeof(MixData)));
if (line->destCh == ch && !skip_mix) {
// one group for the complete mixer channel
auto group = createGroup(form, MIXSRC_FIRST_CH + ch);
groups.emplace_back(group);
while (index < MAX_MIXERS && (line->destCh == ch) && !skip_mix) {
// one button per input line
auto btn = createLineButton(group, index);
if (!focusSet) {
focusSet = true;
lv_group_focus_obj(btn->getLvObj());
}
++index;
++line;
skip_mix = (ch == 0 && is_memclear(line, sizeof(MixData)));
}
}
}
}
void ModelMixesPage::enableMonitors(bool enabled)