Merge branch 'fieldOfView-fix_dialog_scales'

This commit is contained in:
Ghostkeeper 2016-12-27 10:41:46 +01:00
commit 84871017b8
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 6 additions and 1 deletions

View file

@ -322,7 +322,7 @@ Item {
id: settingPickDialog
title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
width: screenScaleFactor * 360;
width: Screen.devicePixelRatio * 360;
property string labelFilter: ""

View file

@ -20,6 +20,11 @@ UM.Dialog
property string preferredCategory: "Ultimaker"
property string activeCategory: preferredCategory
minimumWidth: UM.Theme.getSize("modal_window_minimum").width
minimumHeight: UM.Theme.getSize("modal_window_minimum").height
width: minimumWidth
height: minimumHeight
onVisibilityChanged:
{
// Reset selection and machine name