diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
| commit | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (patch) | |
| tree | 56ec1b5d03809653648e2f50d4ff88be4d7951bd /src/controls/ApplicationWindow.qml | |
| parent | 51156e412b2f91dbbf8c0b6055e6ab4c29370d8a (diff) | |
| parent | b69eb02366ad6d8647238f4caf8edfdcaea1b526 (diff) | |
| download | qtquickcontrols-ff5d39f0a8f34cdb034df703e7b2a769c945e1ed.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/controls/data/tst_applicationwindow.qml
Change-Id: I2ba1f1ba9604f9417102ff076e4ab9ab4d37ab7a
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index df29e5e2..c8e374ad 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -149,8 +149,24 @@ Window { */ readonly property real __qwindowsize_max: (1 << 24) - 1 - width: contentArea.__noImplicitWidthGiven ? 0 : Math.min(Math.max(minimumWidth, contentArea.implicitWidth), maximumWidth) - height: contentArea.__noImplicitHeightGiven ? 0 : Math.min(Math.max(minimumHeight, contentArea.implicitHeight + __topBottomMargins), maximumHeight) + /*! \internal */ + property real __width: 0 + Binding { + target: root + property: "__width" + when: root.minimumWidth <= root.maximumWidth + value: Math.max(Math.min(root.maximumWidth, contentArea.implicitWidth), root.minimumWidth) + } + /*! \internal */ + property real __height: 0 + Binding { + target: root + property: "__height" + when: root.minimumHeight <= root.maximumHeight + value: Math.max(Math.min(root.maximumHeight, contentArea.implicitHeight), root.minimumHeight) + } + width: contentArea.__noImplicitWidthGiven ? 0 : __width + height: contentArea.__noImplicitHeightGiven ? 0 : __height minimumWidth: contentArea.__noMinimumWidthGiven ? 0 : contentArea.minimumWidth minimumHeight: contentArea.__noMinimumHeightGiven ? 0 : (contentArea.minimumHeight + __topBottomMargins) |