CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix touchevent tap

Browse Source
This commit is contained in:
Riku Isokoski
2021-06-11 13:26:28 +03:00
parent 79f0fcb07a
commit 123c6f1917
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/displayapp/DisplayApp.cpp
View File

@@ -162,7 +162,8 @@ void DisplayApp::Refresh() {
case Messages::TouchEvent: {
if (state != States::Running)
break;
auto gesture = OnTouchEvent();
auto info = touchPanel.GetTouchInfo();
auto gesture = OnTouchEvent(info);
if (!currentScreen->OnTouchEvent(gesture)) {
if (currentApp == Apps::Clock) {
switch (gesture) {
@@ -183,6 +184,8 @@ void DisplayApp::Refresh() {
}
} else if (returnTouchEvent == gesture) {
LoadApp(returnToApp, returnDirection);
} else if (touchMode == TouchModes::Gestures) {
lvgl.SetNewTapEvent(info.x, info.y);
}
}
} break;
@@ -368,14 +371,10 @@ void DisplayApp::PushMessage(Messages msg) {
}
}
TouchEvents DisplayApp::OnTouchEvent() {
auto info = touchPanel.GetTouchInfo();
TouchEvents DisplayApp::OnTouchEvent(Pinetime::Drivers::Cst816S::TouchInfos info) {
if (info.isTouch) {
switch (info.gesture) {
case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
if (touchMode == TouchModes::Gestures) {
lvgl.SetNewTapEvent(info.x, info.y);
}
return TouchEvents::Tap;
case Pinetime::Drivers::Cst816S::Gestures::LongPress:
return TouchEvents::LongTap;