summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-08-03 17:39:54 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-08-18 13:43:15 +0200
commit322742fbdc9a18497946fc736daba9f6bf73ac54 (patch)
tree61979f1b4d4536ffd6727c7683c99345bbd52f95 /src/core
parenta180f3a54b076be70ad137ecfd89af2b6efdaa8e (diff)
Fix compilation after 4e400369 in base
This change requires follow up to implement conversion between tablet events in qt and motion events in chromium, since touch events in qt come from 'finger'. Change-Id: Idf8ebd48dfdcd9c1618cbb8d5a621843656b145f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/render_widget_host_view_qt_delegate_client.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/render_widget_host_view_qt_delegate_client.cpp b/src/core/render_widget_host_view_qt_delegate_client.cpp
index 6ba106fcd..2c427cd46 100644
--- a/src/core/render_widget_host_view_qt_delegate_client.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_client.cpp
@@ -84,9 +84,10 @@ mapTouchPointIds(const QList<QTouchEvent::TouchPoint> &inputPoints)
QMap<int, int>::const_iterator it = touchIdMapping.find(qtId);
if (it == touchIdMapping.end())
it = touchIdMapping.insert(qtId, firstAvailableId(touchIdMapping));
- point.setId(it.value());
+ QMutableEventPoint &mut = QMutableEventPoint::from(point);
+ mut.setId(it.value());
- if (point.state() == Qt::TouchPointReleased)
+ if (point.state() == QEventPoint::State::Released)
touchIdMapping.remove(qtId);
}
@@ -177,10 +178,9 @@ public:
float GetHistoricalY(size_t pointer_index, size_t historical_index) const override { return 0; }
ToolType GetToolType(size_t pointer_index) const override
{
- return (touchPoints.at(pointer_index).flags() & QTouchEvent::TouchPoint::InfoFlag::Pen)
- ? ui::MotionEvent::ToolType::STYLUS
- : ui::MotionEvent::ToolType::FINGER;
+ return ui::MotionEvent::ToolType::FINGER;
}
+
int GetButtonState() const override { return 0; }
private: