From a6e55c907e8b1f2928d7b642272e29522965ac6d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 12 Oct 2016 14:49:03 +0200 Subject: 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 --- examples/quickcontrols2/gallery/gallery.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'examples') 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 -- cgit v1.2.3