Merge pull request #1910 from Ultimaker/fix_dialog_sizes

Fix dialog sizes.
Tested on different OSes and screens, all looked good.
This commit is contained in:
Mark 2017-06-08 11:08:56 +02:00
parent d44caa281b
commit 8ab5c7e4cd
7 changed files with 30 additions and 31 deletions

View file

@ -12,15 +12,12 @@ UM.Dialog
{
title: catalog.i18nc("@title:window", "Open Project")
width: 550 * Screen.devicePixelRatio
minimumWidth: 550 * Screen.devicePixelRatio
maximumWidth: minimumWidth
width: 500
height: 400
property int comboboxHeight: 15
property int spacerHeight: 10
height: 400 * Screen.devicePixelRatio
minimumHeight: 400 * Screen.devicePixelRatio
maximumHeight: minimumHeight
property int comboboxHeight: 15 * Screen.devicePixelRatio
property int spacerHeight: 10 * Screen.devicePixelRatio
onClosing: manager.notifyClosed()
onVisibleChanged:
{
@ -34,7 +31,7 @@ UM.Dialog
Item
{
anchors.fill: parent
anchors.margins: 20 * Screen.devicePixelRatio
anchors.margins: 20
UM.I18nCatalog
{
@ -376,7 +373,6 @@ UM.Dialog
enabled: true
anchors.bottom: parent.bottom
anchors.right: ok_button.left
anchors.bottomMargin: - 0.5 * height
anchors.rightMargin:2
}
Button
@ -384,7 +380,6 @@ UM.Dialog
id: ok_button
text: catalog.i18nc("@action:button","Open");
onClicked: { manager.closeBackend(); manager.onOkButtonClicked() }
anchors.bottomMargin: - 0.5 * height
anchors.bottom: parent.bottom
anchors.right: parent.right
}