diff options
| author | Shawn Rutledge <[email protected]> | 2013-10-25 15:24:50 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-10-26 01:52:10 +0200 |
| commit | 6041de9ad7ec9407507ea0e77f3588039db28634 (patch) | |
| tree | 6b2a6eeadea28888bab189b158738403faa55f07 /src | |
| parent | cca9522e7ca0c040ae354b20f09983005ef955bd (diff) | |
QtQuick.Dialogs: resolution-independent controls use actual resolution
logicalPixelDensity ended up hard-coded on Android, which made the
buttons and the FileDialog too small again.
Change-Id: Ic1805246c4466d7167d422ba48ae5ec37978d332
Reviewed-by: Jens Bache-Wiig <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/dialogs/DefaultColorDialog.qml | 3 | ||||
| -rw-r--r-- | src/imports/dialogs/DefaultFileDialog.qml | 4 | ||||
| -rw-r--r-- | src/imports/dialogs/qml/Button.qml | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/imports/dialogs/DefaultColorDialog.qml b/src/imports/dialogs/DefaultColorDialog.qml index 1d4c4a704b..2449d5b01b 100644 --- a/src/imports/dialogs/DefaultColorDialog.qml +++ b/src/imports/dialogs/DefaultColorDialog.qml @@ -62,7 +62,7 @@ AbstractColorDialog { Rectangle { id: content property int maxSize: 0.9 * Math.min(Screen.desktopAvailableWidth, Screen.desktopAvailableHeight) - implicitHeight: Math.min(maxSize, Screen.logicalPixelDensity * (usePaletteMap ? 100 : 50)) + implicitHeight: Math.min(maxSize, Screen.pixelDensity * (usePaletteMap ? 100 : 50)) implicitWidth: usePaletteMap ? implicitHeight - bottomMinHeight : implicitHeight * 1.5 color: palette.window property real bottomMinHeight: sliders.height + buttonRow.height + outerSpacing * 3 @@ -295,6 +295,7 @@ AbstractColorDialog { } Row { spacing: content.spacing + height: parent.height TextField { id: colorField text: root.currentColor.toString() diff --git a/src/imports/dialogs/DefaultFileDialog.qml b/src/imports/dialogs/DefaultFileDialog.qml index fb6996b80c..60928934d8 100644 --- a/src/imports/dialogs/DefaultFileDialog.qml +++ b/src/imports/dialogs/DefaultFileDialog.qml @@ -120,9 +120,9 @@ AbstractFileDialog { Rectangle { property int maxSize: Math.min(Screen.desktopAvailableWidth, Screen.desktopAvailableHeight) // TODO: QTBUG-29817 geometry from AbstractFileDialog - implicitWidth: Math.min(maxSize, Screen.logicalPixelDensity * 100) - implicitHeight: Math.min(maxSize, Screen.logicalPixelDensity * 80) id: window + implicitWidth: Math.min(maxSize, Screen.pixelDensity * 100) + implicitHeight: Math.min(maxSize, Screen.pixelDensity * 80) color: palette.window SystemPalette { id: palette } diff --git a/src/imports/dialogs/qml/Button.qml b/src/imports/dialogs/qml/Button.qml index 19ed073484..f48264d5ff 100644 --- a/src/imports/dialogs/qml/Button.qml +++ b/src/imports/dialogs/qml/Button.qml @@ -49,8 +49,8 @@ Item { signal clicked property alias containsMouse: mouseArea.containsMouse property alias pressed: mouseArea.pressed - implicitHeight: Math.max(Screen.logicalPixelDensity * 7, buttonLabel.implicitHeight * 1.2) - implicitWidth: visible ? Math.max(Screen.logicalPixelDensity * 11, buttonLabel.implicitWidth * 1.3) : 0 + implicitHeight: Math.max(Screen.pixelDensity * 7, buttonLabel.implicitHeight * 1.2) + implicitWidth: visible ? Math.max(Screen.pixelDensity * 11, buttonLabel.implicitWidth * 1.3) : 0 height: implicitHeight width: implicitWidth |