fix(color): some lines containing boxes could be scrolled horizontally (#2471)
This commit is contained in:
@@ -28,6 +28,7 @@ ChannelRange::ChannelRange(Window* parent) :
|
|||||||
FormGroup(parent, rect_t{})
|
FormGroup(parent, rect_t{})
|
||||||
{
|
{
|
||||||
setFlexLayout(LV_FLEX_FLOW_ROW);
|
setFlexLayout(LV_FLEX_FLOW_ROW);
|
||||||
|
lv_obj_set_width(lvobj, LV_SIZE_CONTENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChannelRange::build()
|
void ChannelRange::build()
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ FailsafeChoice::FailsafeChoice(Window* parent, uint8_t moduleIdx) :
|
|||||||
FormGroup(parent, rect_t{})
|
FormGroup(parent, rect_t{})
|
||||||
{
|
{
|
||||||
setFlexLayout(LV_FLEX_FLOW_ROW);
|
setFlexLayout(LV_FLEX_FLOW_ROW);
|
||||||
|
lv_obj_set_width(lvobj, LV_SIZE_CONTENT);
|
||||||
|
|
||||||
auto md = &g_model.moduleData[moduleIdx];
|
auto md = &g_model.moduleData[moduleIdx];
|
||||||
auto choice =
|
auto choice =
|
||||||
@@ -245,6 +246,7 @@ void ModuleWindow::updateModule()
|
|||||||
new StaticText(line, rect_t{},"");
|
new StaticText(line, rect_t{},"");
|
||||||
auto box = new FormGroup(line, rect_t{});
|
auto box = new FormGroup(line, rect_t{});
|
||||||
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8));
|
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8));
|
||||||
|
lv_obj_set_width(box->getLvObj(), LV_SIZE_CONTENT);
|
||||||
idUnique = new StaticText(box, rect_t{}, "", 0, 0);
|
idUnique = new StaticText(box, rect_t{}, "", 0, 0);
|
||||||
updateIDStaticText(moduleIdx);
|
updateIDStaticText(moduleIdx);
|
||||||
}
|
}
|
||||||
@@ -254,6 +256,7 @@ void ModuleWindow::updateModule()
|
|||||||
|
|
||||||
auto box = new FormGroup(line, rect_t{});
|
auto box = new FormGroup(line, rect_t{});
|
||||||
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8));
|
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8));
|
||||||
|
lv_obj_set_width(box->getLvObj(), LV_SIZE_CONTENT);
|
||||||
|
|
||||||
// Model index
|
// Model index
|
||||||
auto modelId = &g_model.header.modelId[moduleIdx];
|
auto modelId = &g_model.header.modelId[moduleIdx];
|
||||||
@@ -726,6 +729,7 @@ ModulePage::ModulePage(uint8_t moduleIdx) : Page(ICON_MODEL_SETUP)
|
|||||||
|
|
||||||
auto box = new FormGroup(line, rect_t{});
|
auto box = new FormGroup(line, rect_t{});
|
||||||
box->setFlexLayout(LV_FLEX_FLOW_ROW);
|
box->setFlexLayout(LV_FLEX_FLOW_ROW);
|
||||||
|
lv_obj_set_width(box->getLvObj(), LV_SIZE_CONTENT);
|
||||||
|
|
||||||
ModuleData* md = &g_model.moduleData[moduleIdx];
|
ModuleData* md = &g_model.moduleData[moduleIdx];
|
||||||
auto moduleChoice = new Choice(box, rect_t{}, STR_INTERNAL_MODULE_PROTOCOLS,
|
auto moduleChoice = new Choice(box, rect_t{}, STR_INTERNAL_MODULE_PROTOCOLS,
|
||||||
|
|||||||
@@ -65,6 +65,8 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
|
|||||||
|
|
||||||
auto form = new FormGroup(&body, rect_t{});
|
auto form = new FormGroup(&body, rect_t{});
|
||||||
form->setFlexLayout();
|
form->setFlexLayout();
|
||||||
|
form->padAll(lv_dpx(8));
|
||||||
|
|
||||||
FlexGridLayout grid(line_col_dsc, line_row_dsc, 2);
|
FlexGridLayout grid(line_col_dsc, line_row_dsc, 2);
|
||||||
|
|
||||||
TimerData* p_timer = &g_model.timers[timer];
|
TimerData* p_timer = &g_model.timers[timer];
|
||||||
@@ -116,6 +118,7 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
|
|||||||
|
|
||||||
auto box = new FormGroup(line, rect_t{});
|
auto box = new FormGroup(line, rect_t{});
|
||||||
box->setFlexLayout(LV_FLEX_FLOW_ROW);
|
box->setFlexLayout(LV_FLEX_FLOW_ROW);
|
||||||
|
lv_obj_set_width(box->getLvObj(), LV_SIZE_CONTENT);
|
||||||
|
|
||||||
new Choice(box, rect_t{}, STR_VBEEPCOUNTDOWN, COUNTDOWN_SILENT,
|
new Choice(box, rect_t{}, STR_VBEEPCOUNTDOWN, COUNTDOWN_SILENT,
|
||||||
COUNTDOWN_COUNT - 1, GET_SET_DEFAULT(p_timer->countdownBeep));
|
COUNTDOWN_COUNT - 1, GET_SET_DEFAULT(p_timer->countdownBeep));
|
||||||
|
|||||||
Reference in New Issue
Block a user