summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarko Kangas <marko.kangas@digia.com>2014-12-16 17:56:40 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2014-12-18 09:46:52 +0100
commit84569773db68408704193268bc42a200bb25a924 (patch)
treec5ce279a7dd2d123c9f12459b220b0abf49bac50 /src
parent14e2d8cc09192ee5ae6e6d8556135e4bc4e38f62 (diff)
Fix OS X style MDI area subwindow resize
Fixed regression bug of the commit #fc11798 Change-Id: I3d64fd67dfe2196a726886a19b9510dd12ff255d Task-number: QTBUG-43392 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/styles/qmacstyle_mac.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 5c17cdf489..c166b1b26e 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -879,6 +879,10 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
gbi.size = sz == QAquaSizeSmall ? kHIThemeGrowBoxSizeSmall : kHIThemeGrowBoxSizeNormal;
if (HIThemeGetGrowBoxBounds(&p, &gbi, &r) == noErr) {
int width = 0;
+#ifndef QT_NO_MDIAREA
+ if (widg && qobject_cast<QMdiSubWindow *>(widg->parentWidget()))
+ width = r.size.width;
+#endif
ret = QSize(width, r.size.height);
}
}