Changeset 114

Timestamp:

Aug 14, 2009, 11:20:20 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QWidget::map[To|From]Global.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (3 diffs)
• qwidget_p.h (modified) (1 diff)
• qwidget_pm.cpp (modified) (19 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -132 +132 @@
 //  inline void showChildren(bool spontaneous) { d_func()->showChildren(spontaneous); }
 //  inline void hideChildren(bool spontaneous) { d_func()->hideChildren(spontaneous); }
+
 //  inline uint testWindowState(uint teststate){ return dataPtr()->window_state & teststate; }
 //  inline void forceUpdate() {
@@ -1446 +1447 @@
     // qwidget_pm.cpp), we have to validate areas that intersect with our
     // children and siblings, taking their clip regions into account.
-//    validateObstacles();
+    validateObstacles();
 
     Q_ASSERT(testAttribute(Qt::WA_WState_Created));
@@ -1473 +1474 @@
     d_func()->hd = WinBeginPaint(internalWinId(), 0, &rcl);
 
+
+
+
+
+
+
     // it's possible that the update rectangle is empty
     if (rcl.xRight <= rcl.xLeft || rcl.yTop <= rcl.yBottom) {

trunk/src/gui/kernel/qwidget_p.h

@@ -633 +633 @@
 
     void setModal_sys();
+
+
+
+
+
+
+
+
+
     QSizePolicy size_policy;
     QLocale locale;

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -107 +107 @@
 }
 
-// Returns a QWidget pointer or 0 if there is no widget corresponding to the
-// given HWND. As opposed to QWidget::find(), correctly handles WC_FRAME windows
-// created for top level widgets. Used for debugging.
-static QWidget *widgetFromId(HWND hwnd)
-{
-    char buf[10];
-    if (WinQueryClassName(hwnd, sizeof(buf), buf)) {
-        if (!strcmp(buf, "#1")) // WC_FRAME
-            hwnd = WinWindowFromID(hwnd, FID_CLIENT);
-        return QWidget::find(hwnd);
-    }
-    return 0;
-}
-
-// Returns a human readable widget name in the form "class/name".
-// Used for debugging.
-static QByteArray widgetName(QWidget *w)
-{
-    if (w)
-        return QString()
-            .sprintf("%s/%s", w->metaObject()->className(),
-                     w->objectName().toLocal8Bit().constData()).toLocal8Bit();
-    return QByteArray("<no-widget>");
-}
-
 /*!
     \internal
@@ -170 +145 @@
     qDebug("qt_WinInvalidateRegionEx: hwnd=%08lX [%s] "
            "hwndFrom=%08lX hwndTo=%08lX", hwnd,
-           widgetName(widgetFromId(hwnd)).constData(),
+           ).constData(),
            hwndFrom, hwndTo);
 #endif
@@ -200 +175 @@
 #if defined(QT_DEBUGWIDGETMASK)
         qDebug(" child=%08lX [fl=%08lX] [%s]", child, swp.fl,
-               widgetName(widgetFromId(child)).constData());
+               ).constData());
 #endif
         // proceed only if not hidden
@@ -286 +261 @@
     qDebug("qt_WinProcessWindowObstacles: hwnd=%08lX [%s], prcl=%p "
            "hrgn=%08lX, op=%ld flags=%08lX", hwnd,
-           widgetName(widgetFromId(hwnd)).constData(),
+           ).constData(),
            prcl, hrgn, op, flags);
 #endif
@@ -339 +314 @@
 #if defined(QT_DEBUGWIDGETMASK)
                 qDebug(" child=%08lX [fl=%08lX] [%s]", relative, swp.fl,
-                       widgetName(widgetFromId(relative)).constData());
+                       ).constData());
 #endif
                 // skip if hidden
@@ -379 +354 @@
 #if defined(QT_DEBUGWIDGETMASK)
             qDebug(" sibling=%08lX [fl=%08lX] [%s]", relative, swp.fl,
-                   widgetName(widgetFromId(relative)).constData());
+                   ).constData());
 #endif
             // skip if hidden
@@ -429 +404 @@
 #if defined(QT_DEBUGWIDGETMASK)
             qDebug(" parent=%08lX [fl=%08lX] [%s]", parent, swp.fl,
-                   widgetName(widgetFromId(parent)).constData());
+                   ).constData());
 #endif
             delta.x += swp.x;
@@ -438 +413 @@
 #if defined(QT_DEBUGWIDGETMASK)
                 qDebug(" ancestor=%08lX [fl=%08lX] [%s]", relative, swp.fl,
-                       widgetName(widgetFromId(parent)).constData());
+                       ).constData());
 #endif
                 // skip if hidden
@@ -489 +464 @@
 #if defined(QT_DEBUGWIDGETMASK)
     qDebug("qt_WinSetWindowPos: hwnd=%08lX [%s] fl=%08lX", hwnd,
-           widgetName(widgetFromId(hwnd)).constData(), fl);
+           ).constData(), fl);
 #endif
 
@@ -577 +552 @@
         qDebug(" moving up? %ld", up);
         qDebug(" hwndFrom=%08lX [%s]", hwndFrom,
-               widgetName(widgetFromId(hwndFrom)).constData());
+               ).constData());
         qDebug(" hwndTo=%08lX [%s]", hwndTo,
-               widgetName(widgetFromId(hwndTo)).constData());
+               ).constData());
 #endif
 
@@ -593 +568 @@
 #if defined(QT_DEBUGWIDGETMASK)
                 qDebug(" sibling=%08lX [fl=%08lX] [%s]", sibling, swp.fl,
-                       widgetName(widgetFromId(sibling)).constData());
+                       ).constData());
 #endif
                 // proceed only if not hidden
@@ -624 +599 @@
 #if defined(QT_DEBUGWIDGETMASK)
                 qDebug(" sibling=%08lX [fl=%08lX] [%s]", sibling, swp.fl,
-                       widgetName(widgetFromId(sibling)).constData());
+                       ).constData());
 #endif
                 // proceed only if not hidden
@@ -904 +879 @@
                    "|  style = %08lX\n"
                    "|  fcFlags = %08lX",
-                   widgetName(q).constData(), ownerw, title.constData(), fStyle,
-                   fcFlags);
+                   ,
+                   fcFlags);
 #endif
             fId = WinCreateWindow(HWND_DESKTOP, WC_FRAME, title, fStyle,
@@ -932 +907 @@
                    "|  title = '%s'\n"
                    "|  style = %08lX",
-                   widgetName(q).constData(), fId, className.constData(),
+                   ame(q).constData(), fId, className.constData(),
                    title.constData(), style);
 #endif
@@ -945 +920 @@
                    "|  title = '%s'\n"
                    "|  style = %08lX",
-                   widgetName(q).constData(), className.constData(),
+                   ame(q).constData(), className.constData(),
                    title.constData(), style);
 #endif
@@ -1059 +1034 @@
                "|  title = '%s'\n"
                "|  style = %08lX",
-               widgetName(q).constData(), parentw, className.constData(),
+               ame(q).constData(), parentw, className.constData(),
                title.constData(), style);
 #endif
@@ -1133 +1108 @@
 #if defined(QT_DEBUGWINCREATEDESTROY)
             qDebug("|Destroying window [%s]:\n"
-                   "|  hwnd = %08lX", widgetName(this).constData(), id);
+                   "|  hwnd = %08lX", ame(this).constData(), id);
 #endif
 
@@ -1149 +1124 @@
 QPoint QWidget::mapToGlobal(const QPoint &pos) const
 {
-    // @todo implement
-    return QPoint();
+    Q_D(const QWidget);
+    QWidget *parentWindow = window();
+    if (!isVisible() || parentWindow->isMinimized() || !testAttribute(Qt::WA_WState_Created) || !internalWinId()) {
+        QPoint toGlobal = mapTo(parentWindow, pos) + parentWindow->pos();
+        // Adjust for window decorations
+        toGlobal += parentWindow->geometry().topLeft() - parentWindow->frameGeometry().topLeft();
+        return toGlobal;
+    }
+    QPoint pos2 = d->mapToWS(pos);
+    POINTL ptl;
+    ptl.x = pos2.x();
+    // flip y (local) coordinate
+    ptl.y = height() - (pos2.y() + 1);
+    WinMapWindowPoints(internalWinId(), HWND_DESKTOP, &ptl, 1);
+    // flip y (global) coordinate
+    ptl.y = QApplication::desktop()->height() - (ptl.y + 1);
+    return QPoint(ptl.x, ptl.y);
 }
 
 QPoint QWidget::mapFromGlobal(const QPoint &pos) const
 {
-    // @todo implement
-    return QPoint();
+    Q_D(const QWidget);
+    QWidget *parentWindow = window();
+    if (!isVisible() || parentWindow->isMinimized() || !testAttribute(Qt::WA_WState_Created) || !internalWinId()) {
+        QPoint fromGlobal = mapFrom(parentWindow, pos - parentWindow->pos());
+        // Adjust for window decorations
+        fromGlobal -= parentWindow->geometry().topLeft() - parentWindow->frameGeometry().topLeft();
+        return fromGlobal;
+    }
+    POINTL ptl;
+    ptl.x = pos.x();
+    // flip y (global) coordinate
+    ptl.y = QApplication::desktop()->height() - (pos.y() + 1);
+    WinMapWindowPoints(HWND_DESKTOP, internalWinId(), &ptl, 1);
+    // flip y (local) coordinate
+    ptl.y = height() - (ptl.y + 1);
+    return d->mapFromWS(QPoint(ptl.x, ptl.y));
 }
 
@@ -1513 +1517 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE