From 1ec43e27de7b6b25940c66b6fc5def2f6a0ac63b Mon Sep 17 00:00:00 2001 From: ecarlett Date: Thu, 23 May 2024 16:36:07 +0200 Subject: [PATCH] =?UTF-8?q?c'est=20mieux=20align=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compile.sh | 3 ++- src/displayapp/screens/WatchFaceMeow.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compile.sh b/compile.sh index 6ee6c930..fc3a6836 100755 --- a/compile.sh +++ b/compile.sh @@ -1,7 +1,8 @@ #!/bin/bash rm -r build -cp make_pine.sh build/ cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/home/eve/Work/gcc-arm-none-eabi-10.3-2021.10 -DNRF5_SDK_PATH=/home/eve/Work/nRF5_SDK_17.1.0_ddde560 -DTARGET_DEVICE=PINETIME -DBUILD_DFU=1 -DBUILD_RESOURCES=1 -B build -DCMAKE_BUILD_TYPE=Release +cp make_pine_mcu.sh build/ + diff --git a/src/displayapp/screens/WatchFaceMeow.cpp b/src/displayapp/screens/WatchFaceMeow.cpp index e8324534..5b1c94c3 100644 --- a/src/displayapp/screens/WatchFaceMeow.cpp +++ b/src/displayapp/screens/WatchFaceMeow.cpp @@ -240,19 +240,19 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController, bleIcon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_label_set_text_static(bleIcon, Symbols::bluetooth); - lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 0); + lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_TOP_MID, 0, -10); //version par defaut de l'icône avant qu'il aie regardé le statut de l'alarme ? alarmIcon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_label_set_text_static(alarmIcon, Symbols::paw); - lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, -10); + lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 0); //version par defaut de l'icône avant qu'il aie regardé le statut de l'alarme ? labelAlarm = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_obj_set_style_local_text_font(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko); - lv_obj_align(labelAlarm, alarmIcon, LV_ALIGN_OUT_BOTTOM_MID, -15, 10); + lv_obj_align(labelAlarm, alarmIcon, LV_ALIGN_OUT_BOTTOM_MID, -10, 0); lv_label_set_text_static(labelAlarm, "00:00"); @@ -478,14 +478,14 @@ void WatchFaceMeow::Refresh() { //bleState.Get : in displayapp/widgets/StatusIcons.cpp: bleState = bleController.IsConnected(); //dynamic icons have their definitions in displayApp/screens/BleIcon.h / cpp lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get())); - lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); + lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_TOP_MID, 0, -10); } //Add alarm state and time // AlarmState is an enum type in class AlarmController that is in namespace controllers alarmState = alarmController.State()==Pinetime::Controllers::AlarmController::AlarmState::Set; lv_label_set_text_static(alarmIcon, AlarmIcon::GetIcon(alarmState)); - lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, -3); + lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 0); if (alarmState) { uint8_t alarmHours = alarmController.Hours(); uint8_t alarmMinutes = alarmController.Minutes();