2607c3d799
Let the TouchHandler::GestureGet() function return a TouchEvent instead of the touchpanel-driver specific enum. This helps to move the driver specific helper function `ConvertGesture` from `DisplayApp` into `TouchHandler`.
96 lines
2.7 KiB
C++
96 lines
2.7 KiB
C++
#include "touchhandler/TouchHandler.h"
|
|
#ifdef PINETIME_IS_RECOVERY
|
|
#include "displayapp/DummyLittleVgl.h"
|
|
#else
|
|
#include "displayapp/LittleVgl.h"
|
|
#endif
|
|
|
|
using namespace Pinetime::Controllers;
|
|
using namespace Pinetime::Applications;
|
|
|
|
namespace {
|
|
TouchEvents ConvertGesture(Pinetime::Drivers::Cst816S::Gestures gesture) {
|
|
switch (gesture) {
|
|
case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
|
|
return TouchEvents::Tap;
|
|
case Pinetime::Drivers::Cst816S::Gestures::LongPress:
|
|
return TouchEvents::LongTap;
|
|
case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
|
|
return TouchEvents::DoubleTap;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
|
|
return TouchEvents::SwipeRight;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
|
|
return TouchEvents::SwipeLeft;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
|
|
return TouchEvents::SwipeDown;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
|
|
return TouchEvents::SwipeUp;
|
|
case Pinetime::Drivers::Cst816S::Gestures::None:
|
|
default:
|
|
return TouchEvents::None;
|
|
}
|
|
}
|
|
}
|
|
|
|
TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel, Components::LittleVgl& lvgl) : touchPanel {touchPanel}, lvgl {lvgl} {
|
|
}
|
|
|
|
void TouchHandler::CancelTap() {
|
|
if (info.touching) {
|
|
isCancelled = true;
|
|
lvgl.SetNewTouchPoint(-1, -1, true);
|
|
}
|
|
}
|
|
|
|
Pinetime::Applications::TouchEvents TouchHandler::GestureGet() {
|
|
auto returnGesture = gesture;
|
|
gesture = Pinetime::Applications::TouchEvents::None;
|
|
return returnGesture;
|
|
}
|
|
|
|
bool TouchHandler::GetNewTouchInfo() {
|
|
info = touchPanel.GetTouchInfo();
|
|
|
|
if (!info.isValid) {
|
|
return false;
|
|
}
|
|
|
|
if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
|
|
if (gestureReleased) {
|
|
if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown ||
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp ||
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight ||
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::LongPress) {
|
|
if (info.touching) {
|
|
gesture = ConvertGesture(info.gesture);
|
|
gestureReleased = false;
|
|
}
|
|
} else {
|
|
gesture = ConvertGesture(info.gesture);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!info.touching) {
|
|
gestureReleased = true;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void TouchHandler::UpdateLvglTouchPoint() {
|
|
if (info.touching) {
|
|
if (!isCancelled) {
|
|
lvgl.SetNewTouchPoint(info.x, info.y, true);
|
|
}
|
|
} else {
|
|
if (isCancelled) {
|
|
lvgl.SetNewTouchPoint(-1, -1, false);
|
|
isCancelled = false;
|
|
} else {
|
|
lvgl.SetNewTouchPoint(info.x, info.y, false);
|
|
}
|
|
}
|
|
}
|