GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 01:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fieldOfView-fix_dialog_scales'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

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

5
resources/qml/AddMachineDialog.qml
View File

@ -20,6 +20,11 @@ UM.Dialog
property string preferredCategory: "Ultimaker" property string preferredCategory: "Ultimaker"
property string activeCategory: preferredCategory 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: onVisibilityChanged:
{ {
// Reset selection and machine name // Reset selection and machine name