Changeset 496 for trunk

Timestamp:

Jan 31, 2010, 9:37:50 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Fixed: QEvent::Enter/Leave events were delivered incorrectly if the aliend child widget belonging to a native parent intersected with a native child of this parent (for example, in applications such as smplayer, this caused extended tool bars to immediately un-extend once the mouse moves over the extended part).

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -641 +641 @@
 
 /*
-  Internal function called from QWidget::setCursor()
-   force is true if this function is called from dispatchEnterLeave, it means that the
-   mouse is actually directly under this widget.
+    Internal function called from QWidget::setCursor()
+
+    force is true if this function is called from dispatchEnterLeave, it means
+    that the mouse is actually directly under this widget.
 */
 void qt_pm_set_cursor(QWidget *w, bool force)
@@ -1107 +1108 @@
 
             case WM_U_MOUSELEAVE: {
-                // We receive a mouse leave for curWin, meaning
-                // the mouse was moved outside our widgets
+                // mp1 = hwndFrom, mp2 = hwndTo
+                if (hwnd != (HWND)mp1) {
+                    // this must be a LEAVE message from one of the frame
+                    // controls forwarded by WC_FRAME to FID_CLIENT; ignore it
+                    // as it's doesn't actually belong to the given hwnd
+                    break;
+                }
+                // We receive a mouse leave for curWin, meaning the mouse was
+                // moved outside our widgets (in any other case curWin will be
+                // already set to a different value in response to WM_MOUSEMOVE
+                // in translateMouseEvent())
                 if (widget->internalWinId() == curWin) {
                     bool dispatch = !widget->underMouse();
@@ -1707 +1717 @@
     const QPoint widgetPos = mapFromGlobal(QPoint(qmsg.ptl.x, qmsg.ptl.y));
 
-    QWidget *alienWidget = !internalWinId() ? this : childAt(widgetPos);
+    QWidget *alienWidget = !internalWinId() ? this : );
     if (alienWidget && alienWidget->internalWinId())
         alienWidget = 0;
@@ -1767 +1777 @@
                 QApplicationPrivate::dispatchEnterLeave(enter, leave);
                 qt_last_mouse_receiver = enter;
-                curWin = enter ? enter->effectiveWinId() : 0;
+                curWin = ;
             }
         }