diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2017-10-30 17:32:39 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-11-24 20:11:34 +0000 |
| commit | 531665a20c93b6b53fafdffbc3e58a923c3e3122 (patch) | |
| tree | 8703e5f386219e7d03114ed408fe438a7681f3f0 | |
| parent | e812237b6980584fc5939f49f6a18315cc694c3a (diff) | |
Fill pointerType member of pointer events
Fix pointerType of the currently supported (mouse and touch) events.
Support of pen and eraser types is coming with QTBUG-62975.
Backport of 5.10 fix:
64ad0e8b335509970062ba550a06018426b7c285
Task-number: QTBUG-63266
Task-number: QTBUG-64436
Change-Id: Ief32b9680ab5acfb15537aba74c2bcdd6f51c978
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 2 | ||||
| -rw-r--r-- | src/core/web_event_factory.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 0d78d6743..9c6f3d254 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -226,7 +226,7 @@ public: float GetHistoricalTouchMajor(size_t pointer_index, size_t historical_index) const override { return 0; } float GetHistoricalX(size_t pointer_index, size_t historical_index) const override { return 0; } float GetHistoricalY(size_t pointer_index, size_t historical_index) const override { return 0; } - ToolType GetToolType(size_t pointer_index) const override { return ui::MotionEvent::TOOL_TYPE_UNKNOWN; } + ToolType GetToolType(size_t pointer_index) const override { return ui::MotionEvent::TOOL_TYPE_FINGER; } int GetButtonState() const override { return 0; } private: diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 0e46aced5..919ba730f 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -1194,6 +1194,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev, double dpiScale) webKitEvent.type = webEventTypeForEvent(ev); webKitEvent.clickCount = 0; + webKitEvent.pointerType = WebPointerProperties::PointerType::Mouse; return webKitEvent; } @@ -1208,6 +1209,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale) webKitEvent.y = webKitEvent.windowY = ev->pos().y() / dpiScale; webKitEvent.movementX = ev->pos().x() - ev->oldPos().x(); webKitEvent.movementY = ev->pos().y() - ev->oldPos().y(); + webKitEvent.pointerType = WebPointerProperties::PointerType::Mouse; webKitEvent.type = webEventTypeForEvent(ev); return webKitEvent; |