diff options
| author | Adam Pigg <adam@piggz.co.uk> | 2020-07-11 20:41:20 (GMT) |
|---|---|---|
| committer | Adam Pigg <adam@piggz.co.uk> | 2020-07-11 20:41:20 (GMT) |
| commit | 789e06fdb77704fa5da12355ad5f1d8c9d4455e5 (patch) | |
| tree | 56972f902675749e0df58e91d8670dd5215d677e /src/DisplayApp/Screens/Message.cpp | |
| parent | 7a1e6e6e5bf187846bd533f04ee58e04798f0035 (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop' of https://github.com/JF002/Pinetime into music
Diffstat (limited to 'src/DisplayApp/Screens/Message.cpp')
| -rw-r--r-- | src/DisplayApp/Screens/Message.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/DisplayApp/Screens/Message.cpp b/src/DisplayApp/Screens/Message.cpp index c8a4ea1..b83cb75 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"); } |