diff options
author | JF <jf@codingfield.com> | 2020-07-03 21:37:40 +0200 |
---|---|---|
committer | JF <jf@codingfield.com> | 2020-07-03 21:37:40 +0200 |
commit | bb11891b6e66efdc0a0fc8a9761d94719fd4748f (patch) | |
tree | e11e953522ef9f4370b44f8a415d2cc597ef9383 /src/DisplayApp/Screens | |
parent | ca549bcfd86ea3426a74292abbe2e4bd1303cb75 (diff) |
Remove custom styles in Screens and define default style and "Big style" in LittleVgl during the initialization of LVGL.
Diffstat (limited to 'src/DisplayApp/Screens')
-rw-r--r-- | src/DisplayApp/Screens/Clock.cpp | 13 | ||||
-rw-r--r-- | src/DisplayApp/Screens/Clock.h | 7 | ||||
-rw-r--r-- | src/DisplayApp/Screens/Message.cpp | 7 | ||||
-rw-r--r-- | src/DisplayApp/Screens/Message.h | 2 |
4 files changed, 2 insertions, 27 deletions
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp index 07db83ee..68471854 100644 --- a/src/DisplayApp/Screens/Clock.cpp +++ b/src/DisplayApp/Screens/Clock.cpp @@ -11,7 +11,7 @@ using namespace Pinetime::Applications::Screens; extern lv_font_t jetbrains_mono_extrabold_compressed; extern lv_font_t jetbrains_mono_bold_20; - +extern lv_style_t* LabelBigStyle; static void event_handler(lv_obj_t * obj, lv_event_t event) { Clock* screen = static_cast<Clock *>(obj->user_data); @@ -41,21 +41,12 @@ Clock::Clock(DisplayApp* app, lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60); - labelStyle = const_cast<lv_style_t *>(lv_label_get_style(label_date, LV_LABEL_STYLE_MAIN)); - labelStyle->text.font = &jetbrains_mono_bold_20; - - lv_style_copy(&labelBigStyle, labelStyle); - labelBigStyle.text.font = &jetbrains_mono_extrabold_compressed; - - lv_label_set_style(label_date, LV_LABEL_STYLE_MAIN, labelStyle); - label_time = lv_label_create(lv_scr_act(), NULL); - lv_label_set_style(label_time, LV_LABEL_STYLE_MAIN, &labelBigStyle); + lv_label_set_style(label_time, LV_LABEL_STYLE_MAIN, LabelBigStyle); lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0); backgroundLabel = lv_label_create(lv_scr_act(), NULL); backgroundLabel->user_data = this; - lv_label_set_style(backgroundLabel, LV_LABEL_STYLE_MAIN, labelStyle); lv_obj_set_click(backgroundLabel, true); lv_obj_set_event_cb(backgroundLabel, event_handler); lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP); diff --git a/src/DisplayApp/Screens/Clock.h b/src/DisplayApp/Screens/Clock.h index 7c4a09df..2450158d 100644 --- a/src/DisplayApp/Screens/Clock.h +++ b/src/DisplayApp/Screens/Clock.h @@ -66,16 +66,9 @@ namespace Pinetime { DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime; DirtyValue<Pinetime::Version> version; - lv_style_t* labelStyle; - lv_style_t labelBigStyle; - lv_obj_t * label_battery; - - lv_obj_t * label_ble; lv_obj_t* label_time; lv_obj_t* label_date; - lv_obj_t* label_version; lv_obj_t* backgroundLabel; - lv_obj_t * batteryIcon; lv_obj_t * bleIcon; diff --git a/src/DisplayApp/Screens/Message.cpp b/src/DisplayApp/Screens/Message.cpp index c8a4ea1f..b83cb751 100644 --- a/src/DisplayApp/Screens/Message.cpp +++ b/src/DisplayApp/Screens/Message.cpp @@ -24,17 +24,12 @@ Message::Message(DisplayApp* app) : Screen(app) { backgroundLabel = lv_label_create(lv_scr_act(), NULL); backgroundLabel->user_data = this; - labelStyle = const_cast<lv_style_t *>(lv_label_get_style(backgroundLabel, LV_LABEL_STYLE_MAIN)); - labelStyle->text.font = &jetbrains_mono_bold_20; - - lv_label_set_style(backgroundLabel, LV_LABEL_STYLE_MAIN, labelStyle); lv_obj_set_click(backgroundLabel, true); lv_obj_set_event_cb(backgroundLabel, event_handler); lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP); lv_obj_set_size(backgroundLabel, 240, 240); lv_obj_set_pos(backgroundLabel, 0, 0); lv_label_set_text(backgroundLabel, ""); -// lv_obj_align(backgroundLabel, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0); button = lv_btn_create(lv_scr_act(), NULL); lv_obj_set_event_cb(button, event_handler); @@ -42,11 +37,9 @@ Message::Message(DisplayApp* app) : Screen(app) { button->user_data = this; label = lv_label_create(button, NULL); - lv_label_set_style(label, LV_LABEL_STYLE_MAIN, labelStyle); lv_label_set_text(label, "Hello!"); labelClick = lv_label_create(lv_scr_act(), NULL); - lv_label_set_style(labelClick, LV_LABEL_STYLE_MAIN, labelStyle); lv_obj_align(labelClick, button, LV_ALIGN_OUT_BOTTOM_MID, 0, 30); lv_label_set_text(labelClick, "0"); } diff --git a/src/DisplayApp/Screens/Message.h b/src/DisplayApp/Screens/Message.h index 4e87bba4..6ddcbb43 100644 --- a/src/DisplayApp/Screens/Message.h +++ b/src/DisplayApp/Screens/Message.h @@ -22,8 +22,6 @@ namespace Pinetime { void OnObjectEvent(lv_obj_t* obj, lv_event_t event); private: - - lv_style_t* labelStyle; lv_obj_t * label; lv_obj_t* backgroundLabel; lv_obj_t * button; |