diff options
author | mabuch <marcel.buechler@gmail.com> | 2022-04-18 14:35:31 +0200 |
---|---|---|
committer | mabuch <marcel.buechler@gmail.com> | 2022-04-18 14:35:31 +0200 |
commit | 82a4f9aa68c3f8d5f3cfa6de87de078fe680d944 (patch) | |
tree | cc83c0af796a029f9464003cda043f373b716749 /src/touchhandler/TouchHandler.h | |
parent | ea14c580ca6296cb93facf526d65a2db0e3ff1b0 (diff) | |
parent | 2607c3d79947e900ce4c5ded296f649677511a34 (diff) |
resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStyle
Diffstat (limited to 'src/touchhandler/TouchHandler.h')
-rw-r--r-- | src/touchhandler/TouchHandler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h index ed452b3a..fb3d2654 100644 --- a/src/touchhandler/TouchHandler.h +++ b/src/touchhandler/TouchHandler.h @@ -1,6 +1,6 @@ #pragma once #include "drivers/Cst816s.h" -#include "systemtask/SystemTask.h" +#include "displayapp/TouchEvents.h" namespace Pinetime { namespace Components { @@ -26,13 +26,13 @@ namespace Pinetime { uint8_t GetY() const { return info.y; } - Drivers::Cst816S::Gestures GestureGet(); + Pinetime::Applications::TouchEvents GestureGet(); private: Pinetime::Drivers::Cst816S::TouchInfos info; Pinetime::Drivers::Cst816S& touchPanel; Pinetime::Components::LittleVgl& lvgl; - Pinetime::Drivers::Cst816S::Gestures gesture; + Pinetime::Applications::TouchEvents gesture; bool isCancelled = false; bool gestureReleased = true; }; |