Changeset 187

Timestamp:

Sep 17, 2009, 3:09:44 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed child widget duplication (#74).

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qwidget_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -645 +645 @@
             if (qApp->activePopupWidget() != 0) { // in popup mode
                 QWidget *w = QApplication::widgetAt(qmsg.ptl.x, qmsg.ptl.y);
-                if (w) {
-                    POINTL ptl = { SHORT1FROMMP(qmsg.mp1), SHORT2FROMMP(qmsg.mp1) };
-                    WinMapWindowPoints(qmsg.hwnd, w->winId(), &ptl, 1);
-                    qmsg.mp1 = MPFROM2SHORT(ptl.x, ptl.y);
+                if (w)
                     widget = (QETWidget*)w;
-                }
             }
             if (widget->translateMouseEvent(qmsg)) // mouse event

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1938 +1938 @@
                     qt_WinSetWindowPos(q->internalWinId(), 0, xrect.x(),
                                        // flip y coordinate
-                                       h - (xrect.y() + 1),
+                                       h - (xrect.y() + xrect.height()),
                                        xrect.width(), xrect.height(),
                                        SWP_MOVE | SWP_SIZE);
@@ -1999 +1999 @@
         qt_WinSetWindowPos(q->internalWinId(), 0, xrect.x(),
                            // flip y coordinate
-                           h - (xrect.y() + 1),
+                           h - (xrect.y() + xrect.height()),
                            xrect.width(), xrect.height(), SWP_MOVE | SWP_SIZE);
     }