3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make combobox font and padding customizable.

Browse source 
Style WorkspaceDialog comboboxes similar to MachineSelector

CURA-9424
This commit is contained in:
Joey de l'Arago 2022-11-17 14:41:14 +01:00
parent 70f7f68a51
commit da71983891
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -195,6 +195,17 @@ UM.Dialog
model: resolveStrategiesModel model: resolveStrategiesModel
textRole: "label" textRole: "label"
visible: manager.qualityChangesConflict visible: manager.qualityChangesConflict
contentLeftPadding: UM.Theme.getSize("default_margin").width
textFont: UM.Theme.getFont("medium")
background: Cura.RoundedRectangle
{
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
color: qualityChangesResolveComboBox.hovered ? UM.Theme.getColor("expandable_hover") : UM.Theme.getColor("action_button")
cornerSide: Cura.RoundedRectangle.Direction.All
radius: UM.Theme.getSize("default_radius").width
}
// This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded // This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded
currentIndex: currentIndex:
@ -238,6 +249,17 @@ UM.Dialog
model: resolveStrategiesModel model: resolveStrategiesModel
textRole: "label" textRole: "label"
visible: manager.materialConflict visible: manager.materialConflict
contentLeftPadding: UM.Theme.getSize("default_margin").width
textFont: UM.Theme.getFont("medium")
background: Cura.RoundedRectangle
{
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
color: materialResolveComboBox.hovered ? UM.Theme.getColor("expandable_hover") : UM.Theme.getColor("action_button")
cornerSide: Cura.RoundedRectangle.Direction.All
radius: UM.Theme.getSize("default_radius").width
}
// This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded // This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded
currentIndex: currentIndex:

1
resources/qml/RoundedRectangle.qml
View file

@ -1,3 +1,4 @@
import QtQuick 2.7 import QtQuick 2.7
import UM 1.2 as UM import UM 1.2 as UM

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

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