diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-09 19:02:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 19:02:41 -0400 |
| commit | 0b3d4db98b5bc6f81a22e4618dbabbdafcec0ada (patch) | |
| tree | e3574b49f5a9e4c762e709ada72e0c1ba16e2fff /src/yuzu/bootmanager.h | |
| parent | fe16905de1433064ffcf601755d364f4c0438ea4 (diff) | |
| parent | 4f24343f32ed253efb2cedba03d20c620841dca1 (diff) | |
Merge pull request #1463 from FearlessTobi/port-4310
Port citra-emu/citra#4310: "Handle touch input"
Diffstat (limited to 'src/yuzu/bootmanager.h')
| -rw-r--r-- | src/yuzu/bootmanager.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index f133bfadf..873985564 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -15,6 +15,7 @@ class QKeyEvent; class QScreen; +class QTouchEvent; class GGLWidgetInternal; class GMainWindow; @@ -119,7 +120,7 @@ public: void restoreGeometry(const QByteArray& geometry); // overridden QByteArray saveGeometry(); // overridden - qreal windowPixelRatio(); + qreal windowPixelRatio() const; void closeEvent(QCloseEvent* event) override; @@ -130,6 +131,8 @@ public: void mouseMoveEvent(QMouseEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; + bool event(QEvent* event) override; + void focusOutEvent(QFocusEvent* event) override; void OnClientAreaResized(unsigned width, unsigned height); @@ -148,6 +151,11 @@ signals: void Closed(); private: + std::pair<unsigned, unsigned> ScaleTouch(const QPointF pos) const; + void TouchBeginEvent(const QTouchEvent* event); + void TouchUpdateEvent(const QTouchEvent* event); + void TouchEndEvent(); + void OnMinimalClientAreaChangeRequest( const std::pair<unsigned, unsigned>& minimal_size) override; |
