diff --git a/radio/src/gui/colorlcd/model_heli.cpp b/radio/src/gui/colorlcd/model_heli.cpp index e7eeab5c1..44de63d94 100644 --- a/radio/src/gui/colorlcd/model_heli.cpp +++ b/radio/src/gui/colorlcd/model_heli.cpp @@ -65,7 +65,9 @@ void ModelHeliPage::build(FormWindow* form) GET_SET_DEFAULT(g_model.swashR.elevatorSource)); // Elevator weight - new StaticText(line, rect_t{}, STR_WEIGHT, 0, COLOR_THEME_PRIMARY1); + auto w = new StaticText(line, rect_t{}, STR_WEIGHT, 0, COLOR_THEME_PRIMARY1); + lv_obj_set_style_grid_cell_x_align(w->getLvObj(), LV_GRID_ALIGN_END, 0); + lv_obj_set_style_pad_right(w->getLvObj(), lv_dpx(8), 0); new NumberEdit(line, rect_t{}, -100, 100, GET_SET_DEFAULT(g_model.swashR.elevatorWeight)); @@ -76,7 +78,9 @@ void ModelHeliPage::build(FormWindow* form) GET_SET_DEFAULT(g_model.swashR.aileronSource)); // Aileron weight - new StaticText(line, rect_t{}, STR_WEIGHT, 0, COLOR_THEME_PRIMARY1); + w = new StaticText(line, rect_t{}, STR_WEIGHT, 0, COLOR_THEME_PRIMARY1); + lv_obj_set_style_grid_cell_x_align(w->getLvObj(), LV_GRID_ALIGN_END, 0); + lv_obj_set_style_pad_right(w->getLvObj(), lv_dpx(8), 0); new NumberEdit(line, rect_t{}, -100, 100, GET_SET_DEFAULT(g_model.swashR.aileronWeight)); @@ -87,7 +91,9 @@ void ModelHeliPage::build(FormWindow* form) GET_SET_DEFAULT(g_model.swashR.collectiveSource)); // Collective weight - new StaticText(line, rect_t{}, STR_WEIGHT, 0, COLOR_THEME_PRIMARY1); + w = new StaticText(line, rect_t{}, STR_WEIGHT, 0, COLOR_THEME_PRIMARY1); + lv_obj_set_style_grid_cell_x_align(w->getLvObj(), LV_GRID_ALIGN_END, 0); + lv_obj_set_style_pad_right(w->getLvObj(), lv_dpx(8), 0); new NumberEdit(line, rect_t{}, -100, 100, GET_SET_DEFAULT(g_model.swashR.collectiveWeight)); diff --git a/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp b/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp index 5934120f9..478cd6b9a 100644 --- a/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp +++ b/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp @@ -797,7 +797,7 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj) } else if(lv_obj_check_type(obj, &input_mix_line_class)) { lv_obj_add_style(obj, &styles.line_btn, 0); - lv_obj_add_style(obj, &styles.pad_tiny, 0); + lv_obj_add_style(obj, &styles.pad_small, 0); lv_obj_add_style(obj, &styles.bg_color_active, LV_STATE_CHECKED); lv_obj_add_style(obj, &styles.focus_border, LV_STATE_FOCUSED); } diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 3e17d1cd2..ae44b4761 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 3e17d1cd2614122860b9eec50e21a0a18fceea16 +Subproject commit ae44b476112a70fc5225bc4b26cec2aa1d43d908