diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-09-23 10:42:58 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:53:40 (GMT) |
| commit | be6422627d1215f6834f74593dd47c0c65270d90 (patch) | |
| tree | b10492569e3404b74b78edf011db0a577d170a86 | |
| parent | e15e6fd4330c096fb448123712bcbc5f3e4258f3 (diff) | |
| download | Qt-be6422627d1215f6834f74593dd47c0c65270d90.zip Qt-be6422627d1215f6834f74593dd47c0c65270d90.tar.gz Qt-be6422627d1215f6834f74593dd47c0c65270d90.tar.bz2 | |
Calling raise() on a hidden windows makes it visible on Cocoa.
[NSWindow orderFront:] on a hidden window will make it visible. So
raise_sys() will now check if window is visible before this method is
called.
Task-number: 255428
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 9262ee16906fd8e030cd5d2a81d22fe9b791b9f6)
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index d1675f2..0b1a842 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3613,7 +3613,7 @@ void QWidgetPrivate::raise_sys() QMacCocoaAutoReleasePool pool; if (isRealWindow()) { // Calling orderFront shows the window on Cocoa too. - if (!q->testAttribute(Qt::WA_DontShowOnScreen)) { + if (!q->testAttribute(Qt::WA_DontShowOnScreen) && q->isVisible()) { [qt_mac_window_for(q) orderFront:qt_mac_window_for(q)]; } if (qt_mac_raise_process) { //we get to be the active process now |