wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 631170 - mouse hover broken in Qt build r=romaxa a=npodb

Browse Source
This commit is contained in:
Florian Hanel 2011-02-03 23:27:01 +02:00
parent b7fac673c5
commit c1825cc564
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widget/src/qt/mozqwidget.cpp
View File

@ -87,6 +87,7 @@ MozQWidget::MozQWidget(nsWindow* aReceiver, QGraphicsItem* aParent)
setFlag(QGraphicsItem::ItemAcceptsInputMethod); setFlag(QGraphicsItem::ItemAcceptsInputMethod);
setAcceptTouchEvents(true); setAcceptTouchEvents(true);
#endif #endif
setAcceptHoverEvents(true);
} }
MozQWidget::~MozQWidget() MozQWidget::~MozQWidget()
@ -176,7 +177,7 @@ void MozQWidget::hoverLeaveEvent(QGraphicsSceneHoverEvent* aEvent)
void MozQWidget::hoverMoveEvent(QGraphicsSceneHoverEvent* aEvent) void MozQWidget::hoverMoveEvent(QGraphicsSceneHoverEvent* aEvent)
{ {
mReceiver->OnMoveEvent(aEvent); mReceiver->OnMotionNotifyEvent(aEvent->pos(), aEvent->modifiers());
} }
void MozQWidget::keyPressEvent(QKeyEvent* aEvent) void MozQWidget::keyPressEvent(QKeyEvent* aEvent)
@ -318,7 +319,7 @@ void MozQWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* aEvent)
void MozQWidget::mouseMoveEvent(QGraphicsSceneMouseEvent* aEvent) void MozQWidget::mouseMoveEvent(QGraphicsSceneMouseEvent* aEvent)
{ {
mReceiver->OnMotionNotifyEvent(aEvent); mReceiver->OnMotionNotifyEvent(aEvent->pos(), aEvent->modifiers());
} }
void MozQWidget::mousePressEvent(QGraphicsSceneMouseEvent* aEvent) void MozQWidget::mousePressEvent(QGraphicsSceneMouseEvent* aEvent)

1
widget/src/qt/mozqwidget.h
View File

@ -193,6 +193,7 @@ public:
, mTopLevelWidget(aTopLevel) , mTopLevelWidget(aTopLevel)
{ {
scene()->addItem(aTopLevel); scene()->addItem(aTopLevel);
setMouseTracking(true);
} }
protected: protected:

6
widget/src/qt/nsWindow.cpp
View File

@ -1255,14 +1255,14 @@ define CHECK_MOUSE_BLOCKED {}
#endif #endif
nsEventStatus nsEventStatus
nsWindow::OnMotionNotifyEvent(QGraphicsSceneMouseEvent *aEvent) nsWindow::OnMotionNotifyEvent(QPointF aPos, Qt::KeyboardModifiers aModifiers)
{ {
UserActivity(); UserActivity();
CHECK_MOUSE_BLOCKED CHECK_MOUSE_BLOCKED
mMoveEvent.pos = aEvent->pos(); mMoveEvent.pos = aPos;
mMoveEvent.modifiers = aEvent->modifiers(); mMoveEvent.modifiers = aModifiers;
mMoveEvent.needDispatch = true; mMoveEvent.needDispatch = true;
DispatchMotionToMainThread(); DispatchMotionToMainThread();

2
widget/src/qt/nsWindow.h
View File

@ -271,7 +271,7 @@ protected:
virtual nsEventStatus OnCloseEvent(QCloseEvent *); virtual nsEventStatus OnCloseEvent(QCloseEvent *);
virtual nsEventStatus OnEnterNotifyEvent(QGraphicsSceneHoverEvent *); virtual nsEventStatus OnEnterNotifyEvent(QGraphicsSceneHoverEvent *);
virtual nsEventStatus OnLeaveNotifyEvent(QGraphicsSceneHoverEvent *); virtual nsEventStatus OnLeaveNotifyEvent(QGraphicsSceneHoverEvent *);
virtual nsEventStatus OnMotionNotifyEvent(QGraphicsSceneMouseEvent *); virtual nsEventStatus OnMotionNotifyEvent(QPointF, Qt::KeyboardModifiers);
virtual nsEventStatus OnButtonPressEvent(QGraphicsSceneMouseEvent *); virtual nsEventStatus OnButtonPressEvent(QGraphicsSceneMouseEvent *);
virtual nsEventStatus OnButtonReleaseEvent(QGraphicsSceneMouseEvent *); virtual nsEventStatus OnButtonReleaseEvent(QGraphicsSceneMouseEvent *);
virtual nsEventStatus OnMouseDoubleClickEvent(QGraphicsSceneMouseEvent *); virtual nsEventStatus OnMouseDoubleClickEvent(QGraphicsSceneMouseEvent *);