From a3586ffa3db9a2ee229429656b7f3a4f6bffd8fc Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 23 Jul 2013 09:47:35 +0200 Subject: Correct initial/minimum size of default QML ColorDialog Change-Id: Idd53d9c7246b17a9159faec06a7ce6c6355cd09f Task-number: QTBUG-32572 Reviewed-by: Liang Qi --- src/imports/dialogs/DefaultColorDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imports/dialogs/DefaultColorDialog.qml b/src/imports/dialogs/DefaultColorDialog.qml index 8636259957..a69fc3418b 100644 --- a/src/imports/dialogs/DefaultColorDialog.qml +++ b/src/imports/dialogs/DefaultColorDialog.qml @@ -49,7 +49,7 @@ AbstractColorDialog { Rectangle { id: content property int maxSize: 0.9 * Math.min(Screen.desktopAvailableWidth, Screen.desktopAvailableHeight) - implicitHeight: Math.max(maxSize, Screen.logicalPixelDensity * (usePaletteMap ? 10 : 5)) + implicitHeight: Math.min(maxSize, Screen.logicalPixelDensity * (usePaletteMap ? 100 : 50)) implicitWidth: usePaletteMap ? implicitHeight - bottomMinHeight : implicitHeight * 1.5 color: palette.window property real bottomMinHeight: sliders.height + buttonRow.height + outerSpacing * 3 -- cgit v1.2.3