summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qworkspace.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets/qworkspace.cpp')
-rw-r--r--src/gui/widgets/qworkspace.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp
index 7180c4d..3a9b30c 100644
--- a/src/gui/widgets/qworkspace.cpp
+++ b/src/gui/widgets/qworkspace.cpp
@@ -2551,7 +2551,6 @@ QWorkspaceChild::QWorkspaceChild(QWidget* window, QWorkspace *parent, Qt::Window
this, SLOT(titleBarDoubleClicked()));
}
- setMinimumSize(128, 0);
int fw = style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth, 0, this);
setContentsMargins(fw, fw, fw, fw);
@@ -2702,11 +2701,15 @@ QSize QWorkspaceChild::sizeHint() const
QSize QWorkspaceChild::minimumSizeHint() const
{
- if (!childWidget)
- return QWidget::minimumSizeHint() + baseSize();
- QSize s = childWidget->minimumSize();
- if (s.isEmpty())
- s = childWidget->minimumSizeHint();
+ QSize s;
+ if (!childWidget) {
+ s = QWidget::minimumSizeHint();
+ } else {
+ s = childWidget->minimumSize();
+ if (s.isEmpty())
+ s = childWidget->minimumSizeHint();
+ }
+ s = s.expandedTo(QSize(128, 0));
return s + baseSize();
}