Changeset 307 for trunk/src

Timestamp:

Nov 10, 2009, 12:00:52 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed incorrect Qt dirty widget region calculation when processing WM_PAINT messages. This fixes a lot of redraw problems (#80, #91 and more).

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (3 diffs)
• painting/qregion.h (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -693 +693 @@
                 mw = mw->parentWidget()->window();
             if (mw->testAttribute(Qt::WA_WState_Created) && mw != QApplicationPrivate::active_window)
-                WinSetWindowPos(mw->d_func()->frameWinId(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
+                WinSetWindowPos(mw->d_func()->frameWinId(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
         }
     } else {
@@ -1983 +1983 @@
     setAttribute(Qt::WA_PendingUpdate, false);
 
-    // @todo not sure we need it
     const QRegion dirtyInBackingStore(qt_dirtyRegion(this));
     // Make sure the invalidated region contains the region we're about to repaint.
@@ -1989 +1988 @@
     // to enlarge it afterwards (only shrink it).
     if (!dirtyInBackingStore.isEmpty())
-      WinInvalidateRegion(internalWinId(), dirtyInBackingStore.handle(), FALSE);
+      WinInvalidateRegion(internalWinId(), dirtyInBackingStore.handle(height()), FALSE);
 
     RECTL rcl;

trunk/src/gui/painting/qregion.h

@@ -145 +145 @@
     inline HRGN    handle() const { ensureHandle(); return d->rgn; }
 #elif defined(Q_WS_PM)
-    inline HRGN handle(int targetHeight = 0) const {
+    inline HRGN handle(int targetHeight) const {
         if (d->rgn == NULLHANDLE || d->height != targetHeight)
             updateHandle(targetHeight);