summaryrefslogtreecommitdiff
path: root/src/DisplayApp/DisplayApp.cpp
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2020-08-22 16:34:46 +0200
committerGitea <gitea@fake.local>2020-08-22 16:34:46 +0200
commit3011dec66bb6b980e19d435c35bbb385ee200b88 (patch)
tree89be9d38577becd3670b679f4a478f09b56d36b8 /src/DisplayApp/DisplayApp.cpp
parent3310401b3b20ed6d36de21e09001d2da9d5bce21 (diff)
parenta664dec07f894c88105c356816b49cac244ad319 (diff)
Merge branch 'paint' of JF/PineTime into develop
Diffstat (limited to 'src/DisplayApp/DisplayApp.cpp')
-rw-r--r--src/DisplayApp/DisplayApp.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 6de746cc..8def1acb 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -174,8 +174,11 @@ void DisplayApp::Refresh() {
if(touchMode == TouchModes::Polling) {
auto info = touchPanel.GetTouchInfo();
- if(info.action == 2) // 2 = contact
- lvgl.SetNewTapEvent(info.x, info.y);
+ if(info.action == 2) {// 2 = contact
+ if(!currentScreen->OnTouchEvent(info.x, info.y)) {
+ lvgl.SetNewTapEvent(info.x, info.y);
+ }
+ }
}
}