From 1516b082fd75a1c68d98862199bd349175d37a8f Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Thu, 23 Feb 2023 13:35:29 +0200 Subject: TouchHandler: Do not store touch panel reference --- src/touchhandler/TouchHandler.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/touchhandler/TouchHandler.cpp') diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp index d98d2577..b29f951f 100644 --- a/src/touchhandler/TouchHandler.cpp +++ b/src/touchhandler/TouchHandler.cpp @@ -27,18 +27,13 @@ namespace { } } -TouchHandler::TouchHandler(Drivers::Cst816S& touchPanel) : touchPanel {touchPanel} { -} - Pinetime::Applications::TouchEvents TouchHandler::GestureGet() { auto returnGesture = gesture; gesture = Pinetime::Applications::TouchEvents::None; return returnGesture; } -bool TouchHandler::GetNewTouchInfo() { - info = touchPanel.GetTouchInfo(); - +bool TouchHandler::ProcessTouchInfo(Drivers::Cst816S::TouchInfos info) { if (!info.isValid) { return false; } @@ -65,5 +60,7 @@ bool TouchHandler::GetNewTouchInfo() { gestureReleased = true; } + currentTouchPoint = {info.x, info.y, info.touching}; + return true; } -- cgit v1.2.3-70-g09d2