From 79a329fb7117ea5baf3f8291ab0e4a183285b437 Mon Sep 17 00:00:00 2001 From: Tomas Groth Christensen Date: Thu, 7 Sep 2023 15:32:46 +0200 Subject: [PATCH] Squeeze in button unlock option in Wake Up settings --- src/components/settings/Settings.h | 4 ++-- src/displayapp/screens/settings/SettingWakeUp.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index e4f8fb10f3..9a4ff860a6 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -240,7 +240,7 @@ namespace Pinetime { } }; - std::bitset<5> getWakeUpModes() const { + std::bitset<6> getWakeUpModes() const { return settings.wakeUpMode; } @@ -298,7 +298,7 @@ namespace Pinetime { WatchFaceInfineat watchFaceInfineat; - std::bitset<5> wakeUpMode {0}; + std::bitset<6> wakeUpMode {0}; uint16_t shakeWakeThreshold = 150; Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium; diff --git a/src/displayapp/screens/settings/SettingWakeUp.cpp b/src/displayapp/screens/settings/SettingWakeUp.cpp index 4649dc82e2..a48196cc88 100644 --- a/src/displayapp/screens/settings/SettingWakeUp.cpp +++ b/src/displayapp/screens/settings/SettingWakeUp.cpp @@ -8,7 +8,7 @@ using namespace Pinetime::Applications::Screens; -constexpr std::array SettingWakeUp::options; +constexpr std::array SettingWakeUp::options; namespace { void event_handler(lv_obj_t* obj, lv_event_t event) { @@ -27,7 +27,7 @@ SettingWakeUp::SettingWakeUp(Pinetime::Controllers::Settings& settingsController lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5); lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); - lv_obj_set_pos(container1, 10, 35); + lv_obj_set_pos(container1, 10, 0); lv_obj_set_width(container1, LV_HOR_RES - 20); lv_obj_set_height(container1, LV_VER_RES - 20); lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT); @@ -35,7 +35,7 @@ SettingWakeUp::SettingWakeUp(Pinetime::Controllers::Settings& settingsController lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text_static(title, "Wake Up"); lv_label_set_align(title, LV_LABEL_ALIGN_CENTER); - lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15); + lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, -4); lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);