diff options
| author | kieranc <kieranc@gmail.com> | 2022-10-06 15:00:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-06 16:00:35 +0300 |
| commit | 0f1d0bbd1d59f1d8c5572e1484edb8cb2dee3b53 (patch) | |
| tree | 6a27648a2805b1bdc41f9bf7c410fce1a58252ed | |
| parent | a0089e4fd021c88c6ee0d1184e0266fb1753a0ad (diff) | |
Fix button labels (#1361)
| -rw-r--r-- | src/displayapp/screens/WatchFaceInfineat.cpp | 14 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceInfineat.h | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index ae3f3dbb..5822a1e8 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -274,7 +274,8 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app, lv_obj_set_size(btnClose, 60, 60); lv_obj_align(btnClose, lv_scr_act(), LV_ALIGN_CENTER, 0, -80); lv_obj_set_style_local_bg_opa(btnClose, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70); - lv_obj_set_style_local_value_str(btnClose, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "X"); + lv_obj_t* lblClose = lv_label_create(btnClose, nullptr); + lv_label_set_text_static(lblClose, "X"); lv_obj_set_event_cb(btnClose, event_handler); lv_obj_set_hidden(btnClose, true); @@ -283,7 +284,8 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app, lv_obj_set_size(btnNextColor, 60, 60); lv_obj_align(btnNextColor, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 0); lv_obj_set_style_local_bg_opa(btnNextColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70); - lv_obj_set_style_local_value_str(btnNextColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">"); + lv_obj_t* lblNextColor = lv_label_create(btnNextColor, nullptr); + lv_label_set_text_static(lblNextColor, ">"); lv_obj_set_event_cb(btnNextColor, event_handler); lv_obj_set_hidden(btnNextColor, true); @@ -292,7 +294,8 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app, lv_obj_set_size(btnPrevColor, 60, 60); lv_obj_align(btnPrevColor, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 0); lv_obj_set_style_local_bg_opa(btnPrevColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70); - lv_obj_set_style_local_value_str(btnPrevColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<"); + lv_obj_t* lblPrevColor = lv_label_create(btnPrevColor, nullptr); + lv_label_set_text_static(lblPrevColor, "<"); lv_obj_set_event_cb(btnPrevColor, event_handler); lv_obj_set_hidden(btnPrevColor, true); @@ -302,7 +305,8 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app, lv_obj_align(btnToggleCover, lv_scr_act(), LV_ALIGN_CENTER, 0, 80); lv_obj_set_style_local_bg_opa(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70); const char* labelToggle = settingsController.GetInfineatShowSideCover() ? "ON" : "OFF"; - lv_obj_set_style_local_value_str(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, labelToggle); + lblToggle = lv_label_create(btnToggleCover, nullptr); + lv_label_set_text_static(lblToggle, labelToggle); lv_obj_set_event_cb(btnToggleCover, event_handler); lv_obj_set_hidden(btnToggleCover, true); @@ -406,7 +410,7 @@ void WatchFaceInfineat::UpdateSelected(lv_obj_t* object, lv_event_t event) { lv_obj_set_hidden(btnNextColor, showSideCover); lv_obj_set_hidden(btnPrevColor, showSideCover); const char* labelToggle = showSideCover ? "OFF" : "ON"; - lv_obj_set_style_local_value_str(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, labelToggle); + lv_label_set_text_static(lblToggle, labelToggle); } if (object == btnNextColor) { colorIndex = (colorIndex + 1) % nColors; diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index 4a7dbebd..285908e8 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -112,6 +112,7 @@ namespace Pinetime { lv_obj_t* btnPrevColor; lv_obj_t* btnSettings; lv_obj_t* labelBtnSettings; + lv_obj_t* lblToggle; static constexpr int nLines = 9; static constexpr int nColors = 7; // must match number of colors in InfineatColors |