Changeset 306 for trunk/src/gui/widgets

Timestamp:

Nov 9, 2009, 5:24:09 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QPushButton: Fixed: Deactivating the window with a push button showing a popup menu would hide the popup but leave the button pressed due to different native event order [vendor bug].

File:

• trunk/src/gui/widgets/qpushbutton.cpp (modified) (1 diff)

trunk/src/gui/widgets/qpushbutton.cpp

@@ -612 +612 @@
     if (guard) {
         menuOpen = false;
-        q->setDown(false);
+        // on some platforms (e.g. OS/2) QPushButton::focusOutEvent() may be called
+        // before we return from exec() above (for example, as a result of window
+        // deactivation). It will set down to false but since menuOpen won't be
+        // false yet, the button will be redrawn as sunken still. Simple setDown(false)
+        // won't do anything in this case so we need to call update() instead to make
+        // sure the button is redrawn as unsunken.
+        if (down)
+            q->setDown(false);
+        else
+            q->update();
     }
 }