aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/WatchFaceInfineat.h
diff options
context:
space:
mode:
authorDiego Miguel <dmlls@diegomiguel.me>2022-04-04 20:48:39 +0200
committerDiego Miguel <dmlls@diegomiguel.me>2022-06-11 16:57:24 +0200
commit603af7c372bbd1c36e72ba9ef0e80c1ad8b1a438 (patch)
treec0b9a04eb9f8cda571ed2486f21cb81336496f6b /src/displayapp/screens/WatchFaceInfineat.h
parentcb2131ec2cc26a55131192e86287dd6f5fe3e472 (diff)
Better alignment of the date label
Diffstat (limited to 'src/displayapp/screens/WatchFaceInfineat.h')
-rw-r--r--src/displayapp/screens/WatchFaceInfineat.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index 54e3cb74..3e4491fe 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -100,9 +100,14 @@ namespace Pinetime {
lv_obj_t* labelHour;
lv_obj_t* labelMinutes;
lv_obj_t* labelTimeAmPm;
+<<<<<<< HEAD
lv_obj_t* dateContainer;
lv_obj_t* labelDateDay;
lv_obj_t* labelDateNum;
+=======
+ lv_obj_t* dateBleContainer;
+ lv_obj_t* labelDate;
+>>>>>>> 5e798689 (Better alignment of the date label)
lv_obj_t* bleIcon;
lv_obj_t* stepIcon;
lv_obj_t* stepValue;