diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-30 17:23:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:17 +0000 |
| commit | d5bffb5125da23718e8098441b4a4269a5cf2f33 (patch) | |
| tree | 48a39ba7f833116cba7dcc7917d13d34a062949c /src/core/web_event_factory.cpp | |
| parent | 789f375411b542db3ac3be79cbe0a6153720abf1 (diff) | |
Basic adaptations for 64-based
Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 4fb89d4e6..44c04e3e6 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -1203,15 +1203,13 @@ static WebPointerProperties::PointerType pointerTypeForTabletEvent(const QTablet WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev, double dpiScale) { WebMouseEvent webKitEvent(webEventTypeForEvent(ev), - ev->x() / dpiScale, - ev->y() / dpiScale, - ev->globalX(), - ev->globalY(), + WebFloatPoint(ev->x() / dpiScale, ev->y() / dpiScale), + WebFloatPoint(ev->globalX(), ev->globalY()), + mouseButtonForEvent<QMouseEvent>(ev), + 0, modifiersForEvent(ev), currentTimeForEvent(ev)); - webKitEvent.button = mouseButtonForEvent<QMouseEvent>(ev); - webKitEvent.click_count = 0; webKitEvent.pointer_type = WebPointerProperties::PointerType::kMouse; return webKitEvent; @@ -1235,10 +1233,10 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale) WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev, double dpiScale) { WebMouseEvent webKitEvent(webEventTypeForEvent(ev), - ev->x() / dpiScale, - ev->y() / dpiScale, - ev->globalX(), - ev->globalY(), + WebFloatPoint(ev->x() / dpiScale, ev->y() / dpiScale), + WebFloatPoint(ev->globalX(), ev->globalY()), + mouseButtonForEvent<QTabletEvent>(ev), + 0, modifiersForEvent(ev), currentTimeForEvent(ev)); @@ -1248,9 +1246,6 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev, double dpiScale webKitEvent.tangential_pressure = ev->tangentialPressure(); webKitEvent.twist = ev->rotation(); webKitEvent.pointer_type = pointerTypeForTabletEvent(ev); - - webKitEvent.button = mouseButtonForEvent<QTabletEvent>(ev); - webKitEvent.click_count = 0; return webKitEvent; } |