diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-06-11 01:06:24 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-06-11 01:06:24 (GMT) |
| commit | 70bb16eaed1db2933ac21f523cda8cce1da16b3e (patch) | |
| tree | 9a1fb061efc84a19692b05ba12e07d329c25cf6a | |
| parent | b6a36b7a67bcda6956edd56d01001ec51ab26bca (diff) | |
| parent | d61633a8ca0476c4381c4e72c2eb8d3d142b45d3 (diff) | |
Merge tag 'edge-0.2.0' into edge
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.cpp | 8 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.h | 1 | ||||
| -rw-r--r-- | src/libs/lv_conf.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 3209330..46a0d81 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -82,6 +82,7 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app, lv_obj_set_style_local_text_color(memfragLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x272727)); lv_label_set_text_static(memfragLabel, memfrag_label_text); lv_obj_align(memfragLabel, nullptr, LV_ALIGN_IN_RIGHT_MID, 0, -50); + // lv_obj_set_hidden(memfragLabel, true); label_time = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont3); @@ -147,6 +148,11 @@ bool WatchFaceDigital::OnTouchEvent(Pinetime::Applications::TouchEvents event) { return false; } +// bool WatchFaceDigital::OnButtonPushed() { +// RefreshStats(); +// return true; +// } + namespace { template <typename Malloc, typename Free> struct AllocStats { inline AllocStats(const Malloc& m, const Free& f) : ourMalloc(m), ourFree(f) { }; @@ -251,6 +257,7 @@ void WatchFaceDigital::RefreshStats() { s += 4; } lv_label_set_text_static(memfragLabel, memfrag_label_text); + // lv_obj_set_hidden(memfragLabel, false); } void WatchFaceDigital::Refresh() { @@ -351,6 +358,7 @@ void WatchFaceDigital::Refresh() { hhmm_label_text[4] = '0' + (minute % 10); lv_label_set_text_static(label_time, hhmm_label_text); lv_obj_set_hidden(label_time_pm, hide_pm); + // RefreshStats(); } if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) { diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index d62a119..eac21b0 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -39,6 +39,7 @@ namespace Pinetime { void Refresh() override; bool OnTouchEvent(TouchEvents event) override; + // bool OnButtonPushed() override; private: System::SystemTask& systemTask; diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index ff38aec..9f6a995 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -413,7 +413,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in * LV_FONT_DECLARE(my_font_2) */ -#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont0) \ +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont0mono) \ LV_FONT_DECLARE(neofont1) \ LV_FONT_DECLARE(neofont15) \ LV_FONT_DECLARE(neofont15mono) \ |