summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-02-22 21:17:19 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-04-12 05:57:09 (GMT)
commita3f9dfbe3bda60e09769f7a065f4dceea3ccef6e (patch)
treef00f37ba2a0fe6f8daa7e2fbb1595a1ab324527f /src/gui
parent49e63efd2a45e1872468d8d6de1308c96ee92fcb (diff)
downloadQt-a3f9dfbe3bda60e09769f7a065f4dceea3ccef6e.zip
Qt-a3f9dfbe3bda60e09769f7a065f4dceea3ccef6e.tar.gz
Qt-a3f9dfbe3bda60e09769f7a065f4dceea3ccef6e.tar.bz2
Fix initial size of QMainWindow with unified title and toolbar on Mac
On Mac if the toolbar was hidden in a unified title and toolbar main window then it would have too much space between the title and the central widget. Task-number: QTBUG-24423 Change-Id: I5e434da2447f33795f3771e43b42930824482d8e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/qmainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index ba6f783..a47ff8c 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1443,9 +1443,9 @@ bool QMainWindow::event(QEvent *event)
break;
#ifdef Q_WS_MAC
case QEvent::Show:
+ d->layout->blockVisiblityCheck = false;
if (unifiedTitleAndToolBarOnMac())
d->layout->syncUnifiedToolbarVisibility();
- d->layout->blockVisiblityCheck = false;
break;
case QEvent::WindowStateChange:
{