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

Fix scrolling

Browse Source
This commit is contained in:
Raphael Coeffic
2022-06-11 15:38:08 +02:00
committed by Raphael Coeffic
parent 2b7a120a86
commit a877915138
14 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/listbox.cpp
+2 -2
View File
@@ -68,13 +68,13 @@ void ListBase::setSelected(int selected)
this->selected = selected;
if(selectedIndexes.find(selected) != selectedIndexes.end()) { // Already selected -> Deselect it
selectedIndexes.erase(selected);
setScrollPositionY(lineHeight * this->selected - lineHeight);
lv_obj_scroll_to_y(lvobj, lineHeight * this->selected - lineHeight, LV_ANIM_OFF);
if(_multiSelectHandler != nullptr)
_multiSelectHandler(selectedIndexes);
invalidate();
} else { // Not Selected -> Select it
selectedIndexes.insert(selected);
setScrollPositionY(lineHeight * this->selected - lineHeight);
lv_obj_scroll_to_y(lvobj, lineHeight * this->selected - lineHeight, LV_ANIM_OFF);
if (_setValue != nullptr) {
_setValue(this->selected);
}
radio/src/gui/colorlcd/model_curves.cpp
+2 -2
View File
@@ -296,10 +296,10 @@ void ModelCurvesPage::pushEditCurve(int index)
void ModelCurvesPage::rebuild(FormWindow * window, int8_t focusIndex)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusIndex);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelCurvesPage::editCurve(FormWindow * window, uint8_t curve)
radio/src/gui/colorlcd/model_gvars.cpp
+2 -2
View File
@@ -344,10 +344,10 @@ void GVarEditWindow::buildBody(FormWindow * window)
void ModelGVarsPage::rebuild(FormWindow * window)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelGVarsPage::build(FormWindow * window)
radio/src/gui/colorlcd/model_inputs.cpp
+2 -2
View File
@@ -491,10 +491,10 @@ ModelInputsPage::ModelInputsPage():
void ModelInputsPage::rebuild(FormWindow * window, int8_t focusIndex)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusIndex);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelInputsPage::editInput(FormWindow * window, uint8_t input, uint8_t index)
radio/src/gui/colorlcd/model_logical_switches.cpp
+2 -2
View File
@@ -345,10 +345,10 @@ ModelLogicalSwitchesPage::ModelLogicalSwitchesPage():
void ModelLogicalSwitchesPage::rebuild(FormWindow * window, int8_t focusIndex)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusIndex);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelLogicalSwitchesPage::editLogicalSwitch(FormWindow * window, uint8_t lsIndex)
radio/src/gui/colorlcd/model_mixer_scripts.cpp
+6 -6
View File
@@ -156,10 +156,10 @@ class ScriptEditWindow : public Page {
void rebuildBody(FormWindow * window)
{
coord_t scrollPosition = window->getScrollPositionY();
window->clear();
buildBody(window);
window->setScrollPositionY(scrollPosition);
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
buildBody(window);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
};
@@ -228,10 +228,10 @@ ModelMixerScriptsPage::ModelMixerScriptsPage() :
void ModelMixerScriptsPage::rebuild(FormWindow * window, int8_t focusIdx)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusIdx);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelMixerScriptsPage::build(FormWindow * window, int8_t focusIdx)
radio/src/gui/colorlcd/model_mixes.cpp
+2 -2
View File
@@ -381,10 +381,10 @@ ModelMixesPage::ModelMixesPage() :
void ModelMixesPage::rebuild(FormWindow * window, int8_t focusMixIndex)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusMixIndex);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelMixesPage::editMix(FormWindow * window, uint8_t channel, uint8_t mixIndex)
radio/src/gui/colorlcd/model_outputs.cpp
+2 -2
View File
@@ -300,10 +300,10 @@ ModelOutputsPage::ModelOutputsPage() :
void ModelOutputsPage::rebuild(FormWindow *window, int8_t focusChannel)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusChannel);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void ModelOutputsPage::build(FormWindow *window, int8_t focusChannel)
radio/src/gui/colorlcd/model_select.cpp
+3 -2
View File
@@ -785,8 +785,9 @@ class CategoryEditPage : public PageTab
window->setInnerHeight(grid.getWindowHeight());
if(scrolltobot)
window->setScrollPositionY(y+40);
if(scrolltobot) {
lv_obj_scroll_to_y(window->getLvObj(), y + 40, LV_ANIM_OFF);
}
}
private:
ModelSelectMenu *modelselectmenu;
radio/src/gui/colorlcd/model_telemetry.cpp
+2 -2
View File
@@ -432,10 +432,10 @@ void ModelTelemetryPage::checkEvents()
void ModelTelemetryPage::rebuild(FormWindow * window, int8_t focusSensorIndex)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusSensorIndex);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
lastKnownIndex = availableTelemetryIndex();
}
radio/src/gui/colorlcd/radio_sdmanager.cpp
+2 -5
View File
@@ -106,10 +106,10 @@ RadioSdManagerPage::RadioSdManagerPage() :
void RadioSdManagerPage::rebuild(FormWindow * window)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
// TODO elsewhere
@@ -454,16 +454,13 @@ void RadioSdManagerPage::build(FormWindow * window)
menu->addLine(STR_RENAME_FILE, [=]() {
auto few = new FileNameEditWindow(name);
few->setCloseHandler([=]() {
//window->clear();
rebuild(window);
});
});
menu->addLine(STR_DELETE_FILE, [=]() {
f_unlink((const TCHAR*)getFullPath(name));
// coord_t scrollPosition = window->getScrollPositionY();
window->clear();
build(window);
// window->setScrollPositionY(scrollPosition);
});
}
return 0;
radio/src/gui/colorlcd/special_functions.cpp
+2 -2
View File
@@ -613,10 +613,10 @@ SpecialFunctionsPage::SpecialFunctionsPage(CustomFunctionData *functions) :
void SpecialFunctionsPage::rebuild(FormWindow *window,
int8_t focusSpecialFunctionIndex)
{
coord_t scrollPosition = window->getScrollPositionY();
auto scroll_y = lv_obj_get_scroll_y(window->getLvObj());
window->clear();
build(window, focusSpecialFunctionIndex);
window->setScrollPositionY(scrollPosition);
lv_obj_scroll_to_y(window->getLvObj(), scroll_y, LV_ANIM_OFF);
}
void SpecialFunctionsPage::editSpecialFunction(FormWindow *window,
radio/src/gui/colorlcd/view_text.cpp
+1 -1
View File
@@ -344,4 +344,4 @@ void readModelNotes()
#endif
LED_ERROR_END();
}
}
radio/src/thirdparty/libopenui
Vendored
+1 -1
Submodule radio/src/thirdparty/libopenui updated: e6dc11ee06...2435236d71