3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-24 11:21:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #11664 from Ultimaker/CURA-8921

Browse source 
[CURA-8921] Workaround for windows not giving dialogs the correct width.
This commit is contained in:
Remco Burema 2022-03-16 15:29:32 +01:00 • committed by GitHub
commit f4e57b82f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/ColorDialog.qml
View file

@ -24,13 +24,9 @@ UM.Dialog
// In this case we would like to let the content of the dialog determine the size of the dialog // In this case we would like to let the content of the dialog determine the size of the dialog
// however with the current implementation of the dialog this is not possible, so instead we calculate // however with the current implementation of the dialog this is not possible, so instead we calculate
// the size of the dialog ourselves. // the size of the dialog ourselves.
minimumWidth: content.width + 4 * margin // Ugly workaround for windows having overlapping elements due to incorrect dialog width
minimumHeight: minimumWidth: content.width + (Qt.platform.os == "windows" ? 4 * margin : 2 * margin)
content.height // content height minimumHeight: content.height + buttonRow.height + (Qt.platform.os == "windows" ? 5 * margin : 3 * margin)
+ buttonRow.height // button row height
+ 5 * margin // top and bottom margin and margin between buttons and content
width: minimumWidth
height: minimumHeight
property alias color: colorInput.text property alias color: colorInput.text
property var swatchColors: [ property var swatchColors: [