Changeset 301 for trunk/src

Timestamp:

Nov 6, 2009, 8:08:18 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Due to the vertical PM coordinate space flip comparing to the Qt coordinate space, WM_SIZE events from PM may also mean widget movement. These move events were not reported to Qt which resulted widget positions from the Qt point of view not matching the actual positions on screen (#90).

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -2068 +2068 @@
     }
 
+    // Note: due to the vertical coordinate space flip in PM, WM_SIZE events may
+    // also mean moving the widget in Qt coordinates
+
+    if (qmsg.msg == WM_MOVE || qmsg.msg == WM_SIZE) { // move event
+        QPoint oldPos = data->crect.topLeft();
+        SWP swp;
+        if (isWindow()) {
+            WinQueryWindowPos(fId, &swp);
+            // flip y coordinate
+            swp.y = QApplication::desktop()->height() - (swp.y + swp.cy);
+            QTLWExtra *top = d_func()->topData();
+            swp.x += top->frameStrut.left();
+            swp.y += top->frameStrut.top();
+        } else {
+            WinQueryWindowPos(internalWinId(), &swp);
+            // flip y coordinate
+            swp.y = parentWidget()->height() - (swp.y + swp.cy);
+        }
+        QPoint newCPos(swp.x, swp.y);
+        if (newCPos != oldPos) {
+            data->crect.moveTopLeft(newCPos);
+            if (isVisible()) {
+                QMoveEvent e(newCPos, oldPos); // cpos (client position)
+                QApplication::sendSpontaneousEvent(this, &e);
+            } else {
+                QMoveEvent *e = new QMoveEvent(newCPos, oldPos);
+                QApplication::postEvent(this, e);
+            }
+        }
+    }
     if (qmsg.msg == WM_SIZE) { // resize event
         QSize oldSize = data->crect.size();
@@ -2127 +2157 @@
             }
         }
-    } else if (qmsg.msg == WM_MOVE) { // move event
-        QPoint oldPos = data->crect.topLeft();
-        SWP swp;
-        if (isWindow()) {
-            WinQueryWindowPos(fId, &swp);
-            // flip y coordinate
-            swp.y = QApplication::desktop()->height() - (swp.y + swp.cy);
-            QTLWExtra *top = d_func()->topData();
-            swp.x += top->frameStrut.left();
-            swp.y += top->frameStrut.top();
-        } else {
-            WinQueryWindowPos(internalWinId(), &swp);
-            // flip y coordinate
-            swp.y = parentWidget()->height() - (swp.y + swp.cy);
-        }
-        QPoint newCPos(swp.x, swp.y);
-        if (newCPos != oldPos) {
-            data->crect.moveTopLeft(newCPos);
-            if (isVisible()) {
-                QMoveEvent e(newCPos, oldPos); // cpos (client position)
-                QApplication::sendSpontaneousEvent(this, &e);
-            } else {
-                QMoveEvent *e = new QMoveEvent(newCPos, oldPos);
-                QApplication::postEvent(this, e);
-            }
-        }
     }
     setAttribute(Qt::WA_WState_ConfigPending, false);                // clear config flag