3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #13848 from Ultimaker/CURA-9424_workspace_dialog_fixes

Browse source 
[CURA-9424] Workspace dialog fixes
This commit is contained in:
Casper Lamboo 2022-11-17 17:15:34 +01:00 • committed by GitHub
commit ee75fa02aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Widgets/ComboBox.qml
View file

@ -20,6 +20,8 @@ ComboBox
property alias textFormat: contentLabel.textFormat
property alias backgroundColor: background.color
property bool forceHighlight: false
property int contentLeftPadding: UM.Theme.getSize("setting_unit_margin").width
property var textFont: UM.Theme.getFont("default")
enabled: delegateModel.count > 0
@ -104,9 +106,10 @@ ComboBox
contentItem: UM.Label
{
id: contentLabel
leftPadding: UM.Theme.getSize("setting_unit_margin").width + UM.Theme.getSize("default_margin").width
leftPadding: contentLeftPadding + UM.Theme.getSize("default_margin").width
anchors.right: downArrow.left
wrapMode: Text.NoWrap
font: textFont
text:
{
if (control.delegateModel.count == 0)
@ -176,11 +179,12 @@ ComboBox
id: delegateLabel
// FIXME: Somehow the top/bottom anchoring is not correct on Linux and it results in invisible texts.
anchors.fill: parent
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.leftMargin: contentLeftPadding
anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width
text: delegateItem.text
textFormat: control.textFormat
font: textFont
color: UM.Theme.getColor("setting_control_text")
elide: Text.ElideRight
wrapMode: Text.NoWrap