diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-02-23 21:18:59 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-02-23 21:18:59 +0100 |
commit | f864330d355172046fab0923fd9015ec52884f00 (patch) | |
tree | 0fd8743c9ea357d6f3ac61949292187113d3867f /src/displayapp/screens/Brightness.cpp | |
parent | 324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff) | |
parent | 3fe3f06299b37b99cad117e0ec726735acbdc721 (diff) |
Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimorg-LVGL7
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/Modal.cpp
# src/displayapp/screens/Modal.h
# src/displayapp/screens/Notifications.cpp
# src/displayapp/screens/Tile.h
Diffstat (limited to 'src/displayapp/screens/Brightness.cpp')
-rw-r--r-- | src/displayapp/screens/Brightness.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/displayapp/screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp index c8085bed..36820417 100644 --- a/src/displayapp/screens/Brightness.cpp +++ b/src/displayapp/screens/Brightness.cpp @@ -22,7 +22,7 @@ Brightness::Brightness(Pinetime::Applications::DisplayApp *app, Controllers::Bri slider_label = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text(slider_label, LevelToString(brightness.Level())); lv_obj_set_auto_realign(slider_label, true); - lv_obj_align(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); + lv_obj_align(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 30); } Brightness::~Brightness() { @@ -75,6 +75,9 @@ bool Brightness::OnTouchEvent(Pinetime::Applications::TouchEvents event) { switch(event) { case TouchEvents::SwipeLeft: brightness.Lower(); + if ( brightness.Level() == Pinetime::Controllers::BrightnessController::Levels::Off) { + brightness.Set(Controllers::BrightnessController::Levels::Low); + } SetValue(); return true; case TouchEvents::SwipeRight: |