diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-12 14:49:03 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-13 08:21:43 +0000 |
| commit | a6e55c907e8b1f2928d7b642272e29522965ac6d (patch) | |
| tree | 32c501c226b83bc1fac51e49cf205141187865d0 /examples | |
| parent | 47bfafb4aeba36826222fcd2d2e3d2070982d289 (diff) | |
Gallery: fix the height of the settings dialog
The settings dialog used to be a plain Popup, which does not provide
buttons. There were manually created Ok and Cancel buttons in a column
together with the other contents, and the height of the column was used
to calculate the total height of the dialog. Now that the new Dialog
type with support for standard buttons is used, the height of the
column is no longer sufficient since the dialog buttons are not part of
it. Just let the dialog calculate the appropriate height based on its
width and content.
Change-Id: Ib4edf6e525214429887ad4ec6371ac0b5624c2e9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index bead5434..17afc47e 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -219,7 +219,6 @@ ApplicationWindow { x: Math.round((window.width - width) / 2) y: Math.round(window.height / 6) width: Math.round(Math.min(window.width, window.height) / 3 * 2) - height: settingsColumn.implicitHeight + topPadding + bottomPadding modal: true focus: true |