Own window base LVGL object

This commit is contained in:
Raphael Coeffic
2022-06-11 15:38:08 +02:00
committed by Raphael Coeffic
parent cbdc9ad8a8
commit 847ae4aeb1
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -124,7 +124,7 @@ PreflightChecks::PreflightChecks() : Page(ICON_MODEL_SETUP)
make_conditional(line, tw);
new StaticText(line, rect_t{}, STR_CUSTOM_THROTTLE_WARNING, 0, COLOR_THEME_PRIMARY1);
auto box = new FormGroup::Line(line, lv_obj_create(line->getLvObj()), nullptr, form);
auto box = new FormGroup::Line(line, window_create(line->getLvObj()), nullptr, form);
lv_obj_set_layout(box->getLvObj(), LV_LAYOUT_FLEX);
auto cst_tw = new CheckBox(
+1 -1
View File
@@ -87,7 +87,7 @@ void drawSplash()
}
}
splashScreen = lv_obj_create(nullptr);
splashScreen = window_create(nullptr);
if (splashScreen) {
lv_obj_add_event_cb(splashScreen, draw_splash_cb, LV_EVENT_DRAW_MAIN, splashImg);
}
+1 -1
View File
@@ -88,7 +88,7 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
line = body.newLine(&grid);
new StaticText(line, rect_t{}, STR_BEEPCOUNTDOWN, 0, COLOR_THEME_PRIMARY1);
auto box = new FormGroup::Line(line, lv_obj_create(line->getLvObj()), nullptr, &body);
auto box = new FormGroup::Line(line, window_create(line->getLvObj()), nullptr, &body);
lv_obj_set_layout(box->getLvObj(), LV_LAYOUT_FLEX);
new Choice(box, rect_t{}, STR_VBEEPCOUNTDOWN, COUNTDOWN_SILENT,
COUNTDOWN_COUNT - 1, GET_SET_DEFAULT(p_timer->countdownBeep));
@@ -36,7 +36,7 @@ static Window* create_layout_box(Window* parent, lv_align_t align,
{
lv_obj_t* lv_parent = parent->getLvObj();
auto box = lv_obj_create(lv_parent);
auto box = window_create(lv_parent);
lv_obj_set_size(box, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
lv_obj_set_align(box, align);
lv_obj_set_flex_flow(box, flow);