Merge develop into main (#338)
### Cardputer: - Fix keyboard issue with up/down button conflict when selecting switch - Fix backlight flickering ### UI improvements - Removed a 3 pixel border that went around the entire desktop environment - Improved system layout (GuiService) - Statusbar: improved layout (mainly margin/padding) - Toolbar: fixed margin/padding of all buttons, fixed alignment of all content - Improved layout/UI of many apps ### Other - Update LVGL to 9.3.0 official release (was dev version)
This commit is contained in:
committed by
GitHub
parent
53b711584f
commit
a2af95b92d
@@ -83,9 +83,9 @@ void View::createBottomButtons(lv_obj_t* parent) {
|
||||
auto* button_container = lv_obj_create(parent);
|
||||
lv_obj_set_width(button_container, LV_PCT(100));
|
||||
lv_obj_set_height(button_container, LV_SIZE_CONTENT);
|
||||
lv_obj_set_style_pad_all(button_container, 0, 0);
|
||||
lv_obj_set_style_pad_gap(button_container, 0, 0);
|
||||
lv_obj_set_style_border_width(button_container, 0, 0);
|
||||
lv_obj_set_style_pad_all(button_container, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_gap(button_container, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_border_width(button_container, 0, LV_STATE_DEFAULT);
|
||||
|
||||
remember_switch = lv_switch_create(button_container);
|
||||
lv_obj_add_state(remember_switch, LV_STATE_CHECKED);
|
||||
@@ -124,17 +124,17 @@ void View::init(AppContext& app, lv_obj_t* parent) {
|
||||
auto* ssid_wrapper = lv_obj_create(wrapper);
|
||||
lv_obj_set_width(ssid_wrapper, LV_PCT(100));
|
||||
lv_obj_set_height(ssid_wrapper, LV_SIZE_CONTENT);
|
||||
lv_obj_set_style_pad_all(ssid_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_gap(ssid_wrapper, 0, 0);
|
||||
lv_obj_set_style_border_width(ssid_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_all(ssid_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_gap(ssid_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_border_width(ssid_wrapper, 0, LV_STATE_DEFAULT);
|
||||
|
||||
auto* ssid_label_wrapper = lv_obj_create(ssid_wrapper);
|
||||
lv_obj_set_width(ssid_label_wrapper, LV_PCT(50));
|
||||
lv_obj_set_height(ssid_label_wrapper, LV_SIZE_CONTENT);
|
||||
lv_obj_align(ssid_label_wrapper, LV_ALIGN_LEFT_MID, 0, 0);
|
||||
lv_obj_set_style_border_width(ssid_label_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_left(ssid_label_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_right(ssid_label_wrapper, 0, 0);
|
||||
lv_obj_align(ssid_label_wrapper, LV_ALIGN_LEFT_MID, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_border_width(ssid_label_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_left(ssid_label_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_right(ssid_label_wrapper, 0, LV_STATE_DEFAULT);
|
||||
|
||||
auto* ssid_label = lv_label_create(ssid_label_wrapper);
|
||||
lv_label_set_text(ssid_label, "Network:");
|
||||
@@ -145,7 +145,7 @@ void View::init(AppContext& app, lv_obj_t* parent) {
|
||||
lv_obj_set_width(ssid_textarea, LV_PCT(50));
|
||||
|
||||
ssid_error = lv_label_create(wrapper);
|
||||
lv_obj_set_style_text_color(ssid_error, lv_color_make(255, 50, 50), 0);
|
||||
lv_obj_set_style_text_color(ssid_error, lv_color_make(255, 50, 50), LV_STATE_DEFAULT);
|
||||
lv_obj_add_flag(ssid_error, LV_OBJ_FLAG_HIDDEN);
|
||||
|
||||
// Password
|
||||
@@ -153,17 +153,17 @@ void View::init(AppContext& app, lv_obj_t* parent) {
|
||||
auto* password_wrapper = lv_obj_create(wrapper);
|
||||
lv_obj_set_width(password_wrapper, LV_PCT(100));
|
||||
lv_obj_set_height(password_wrapper, LV_SIZE_CONTENT);
|
||||
lv_obj_set_style_pad_all(password_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_gap(password_wrapper, 0, 0);
|
||||
lv_obj_set_style_border_width(password_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_all(password_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_gap(password_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_border_width(password_wrapper, 0, LV_STATE_DEFAULT);
|
||||
|
||||
auto* password_label_wrapper = lv_obj_create(password_wrapper);
|
||||
lv_obj_set_width(password_label_wrapper, LV_PCT(50));
|
||||
lv_obj_set_height(password_label_wrapper, LV_SIZE_CONTENT);
|
||||
lv_obj_align_to(password_label_wrapper, password_wrapper, LV_ALIGN_LEFT_MID, 0, 0);
|
||||
lv_obj_set_style_border_width(password_label_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_left(password_label_wrapper, 0, 0);
|
||||
lv_obj_set_style_pad_right(password_label_wrapper, 0, 0);
|
||||
lv_obj_set_style_border_width(password_label_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_left(password_label_wrapper, 0, LV_STATE_DEFAULT);
|
||||
lv_obj_set_style_pad_right(password_label_wrapper, 0, LV_STATE_DEFAULT);
|
||||
|
||||
auto* password_label = lv_label_create(password_label_wrapper);
|
||||
lv_label_set_text(password_label, "Password:");
|
||||
@@ -175,12 +175,12 @@ void View::init(AppContext& app, lv_obj_t* parent) {
|
||||
lv_obj_set_width(password_textarea, LV_PCT(50));
|
||||
|
||||
password_error = lv_label_create(wrapper);
|
||||
lv_obj_set_style_text_color(password_error, lv_color_make(255, 50, 50), 0);
|
||||
lv_obj_set_style_text_color(password_error, lv_color_make(255, 50, 50), LV_STATE_DEFAULT);
|
||||
lv_obj_add_flag(password_error, LV_OBJ_FLAG_HIDDEN);
|
||||
|
||||
// Connection error
|
||||
connection_error = lv_label_create(wrapper);
|
||||
lv_obj_set_style_text_color(connection_error, lv_color_make(255, 50, 50), 0);
|
||||
lv_obj_set_style_text_color(connection_error, lv_color_make(255, 50, 50), LV_STATE_DEFAULT);
|
||||
lv_obj_add_flag(connection_error, LV_OBJ_FLAG_HIDDEN);
|
||||
|
||||
// Bottom buttons
|
||||
|
||||
Reference in New Issue
Block a user