diff options
| author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
|---|---|---|
| committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
| commit | cc259b6a4ac93d507fa372a41ea653dedeb791ea (patch) | |
| tree | 3c8b8b937b2b91149003195679ce5acda1154c4d /src/displayapp/screens/WatchFaceAnalog.cpp | |
| parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
| parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) | |
resolves conflicts
Diffstat (limited to 'src/displayapp/screens/WatchFaceAnalog.cpp')
| -rw-r--r-- | src/displayapp/screens/WatchFaceAnalog.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp index 53e7faf7..f027a744 100644 --- a/src/displayapp/screens/WatchFaceAnalog.cpp +++ b/src/displayapp/screens/WatchFaceAnalog.cpp @@ -1,9 +1,11 @@ -#include <libs/lvgl/lvgl.h> -#include "WatchFaceAnalog.h" -#include "BatteryIcon.h" -#include "BleIcon.h" -#include "Symbols.h" -#include "NotificationIcon.h" +#include "displayapp/screens/WatchFaceAnalog.h" +#include <cmath> +#include <lvgl/lvgl.h> +#include "displayapp/screens/BatteryIcon.h" +#include "displayapp/screens/BleIcon.h" +#include "displayapp/screens/Symbols.h" +#include "displayapp/screens/NotificationIcon.h" +#include "components/settings/Settings.h" LV_IMG_DECLARE(bg_clock); @@ -73,7 +75,7 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app, notificationIcon = lv_label_create(lv_scr_act(), NULL); lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00)); lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false)); - lv_obj_align(notificationIcon, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); + lv_obj_align(notificationIcon, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0); // Date - Day / Week day |