Title: [94087] trunk/Source/WebKit2
- Revision
- 94087
- Author
- [email protected]
- Date
- 2011-08-30 10:34:05 -0700 (Tue, 30 Aug 2011)
Log Message
[Qt][WK2] Make mouse over work again for QDesktopWebView.
https://bugs.webkit.org/show_bug.cgi?id=67200
Reviewed by Noam Rosenthal.
The API has changed after QGraphicsView, SceneGraph sends
QHoverEvents now.
* UIProcess/qt/qdesktopwebpageproxy.cpp:
(QDesktopWebPageProxy::handleEvent):
(QDesktopWebPageProxy::handleHoverMoveEvent):
* UIProcess/qt/qdesktopwebpageproxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (94086 => 94087)
--- trunk/Source/WebKit2/ChangeLog 2011-08-30 17:09:21 UTC (rev 94086)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-30 17:34:05 UTC (rev 94087)
@@ -1,3 +1,18 @@
+2011-08-30 Alexis Menard <[email protected]>
+
+ [Qt][WK2] Make mouse over work again for QDesktopWebView.
+ https://bugs.webkit.org/show_bug.cgi?id=67200
+
+ Reviewed by Noam Rosenthal.
+
+ The API has changed after QGraphicsView, SceneGraph sends
+ QHoverEvents now.
+
+ * UIProcess/qt/qdesktopwebpageproxy.cpp:
+ (QDesktopWebPageProxy::handleEvent):
+ (QDesktopWebPageProxy::handleHoverMoveEvent):
+ * UIProcess/qt/qdesktopwebpageproxy.h:
+
2011-08-30 Kaustubh Atrawalkar <[email protected]>
The unused ScrollView* argument can and should be removed from
Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp (94086 => 94087)
--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp 2011-08-30 17:09:21 UTC (rev 94086)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp 2011-08-30 17:34:05 UTC (rev 94087)
@@ -91,8 +91,8 @@
return handleMouseDoubleClickEvent(reinterpret_cast<QGraphicsSceneMouseEvent*>(ev));
case QEvent::GraphicsSceneWheel:
return handleWheelEvent(reinterpret_cast<QGraphicsSceneWheelEvent*>(ev));
- case QEvent::GraphicsSceneHoverMove:
- return handleHoverMoveEvent(reinterpret_cast<QGraphicsSceneHoverEvent*>(ev));
+ case QEvent::HoverMove:
+ return handleHoverMoveEvent(reinterpret_cast<QHoverEvent*>(ev));
case QEvent::GraphicsSceneDragEnter:
return handleDragEnterEvent(reinterpret_cast<QGraphicsSceneDragDropEvent*>(ev));
case QEvent::GraphicsSceneDragLeave:
@@ -154,11 +154,10 @@
return ev->isAccepted();
}
-bool QDesktopWebPageProxy::handleHoverMoveEvent(QGraphicsSceneHoverEvent* ev)
+bool QDesktopWebPageProxy::handleHoverMoveEvent(QHoverEvent* ev)
{
QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMouseMove);
me.setPos(ev->pos());
- me.setScreenPos(ev->screenPos());
me.setAccepted(ev->isAccepted());
return handleMouseMoveEvent(&me);
Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h (94086 => 94087)
--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h 2011-08-30 17:09:21 UTC (rev 94086)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h 2011-08-30 17:34:05 UTC (rev 94087)
@@ -54,7 +54,7 @@
bool handleMouseReleaseEvent(QGraphicsSceneMouseEvent*);
bool handleMouseDoubleClickEvent(QGraphicsSceneMouseEvent*);
bool handleWheelEvent(QGraphicsSceneWheelEvent*);
- bool handleHoverMoveEvent(QGraphicsSceneHoverEvent*);
+ bool handleHoverMoveEvent(QHoverEvent*);
bool handleDragEnterEvent(QGraphicsSceneDragDropEvent*);
bool handleDragLeaveEvent(QGraphicsSceneDragDropEvent*);
bool handleDragMoveEvent(QGraphicsSceneDragDropEvent*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
