summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
diff options
context:
space:
mode:
authorJean-François Milants <jf@codingfield.com>2021-07-24 18:47:06 +0200
committerJean-François Milants <jf@codingfield.com>2021-07-24 18:47:06 +0200
commit057de4e6b509e15c89f10158e1935ccdc063deaa (patch)
tree6c40390ff67374d7f072423364533ebc85ccbb63 /src/displayapp/screens
parentd6cccc2dcd95a7d332ee657d1357ae060389f6e6 (diff)
parent926553d04386341f60eaf8c2abb3f50c65b8fb04 (diff)
Merge branch 'Riksu9000-fix_touchevent_tap' into develop
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r--src/displayapp/screens/FlashLight.cpp2
-rw-r--r--src/displayapp/screens/settings/QuickSettings.cpp9
2 files changed, 2 insertions, 9 deletions
diff --git a/src/displayapp/screens/FlashLight.cpp b/src/displayapp/screens/FlashLight.cpp
index 7db2c6c8..63b2345e 100644
--- a/src/displayapp/screens/FlashLight.cpp
+++ b/src/displayapp/screens/FlashLight.cpp
@@ -70,5 +70,5 @@ bool FlashLight::Refresh() {
}
bool FlashLight::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
- return true;
+ return false;
}
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index acc2a27a..3fb9c70b 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -155,14 +155,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
}
bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
- switch (event) {
- case Pinetime::Applications::TouchEvents::SwipeLeft:
- running = false;
- return false;
-
- default:
- return true;
- }
+ return false;
}
bool QuickSettings::Refresh() {