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

Minor changes suggested in review

Browse source 
CURA-5785
This commit is contained in:
Jaime van Kessel 2018-11-21 13:17:36 +01:00
parent eef6ad662d
commit bd636e61a0
6 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PrepareStage/PrepareMenu.qml
View file

@ -34,7 +34,7 @@ Item
anchors.left: openFileButtonBackground.right anchors.left: openFileButtonBackground.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: 0.9 * prepareMenu.width width: Math.round(0.9 * prepareMenu.width)
height: parent.height height: parent.height
spacing: 0 spacing: 0

3
plugins/PreviewStage/PreviewMenu.qml
View file

@ -54,7 +54,7 @@ Item
{ {
// Nothing was active, so just return the first one (the list is sorted by priority, so the most // Nothing was active, so just return the first one (the list is sorted by priority, so the most
// important one should be returned) // important one should be returned)
if(activeView == null) if (activeView == null)
{ {
UM.Controller.setActiveView(viewModel.getItem(0).id) UM.Controller.setActiveView(viewModel.getItem(0).id)
} }
@ -68,6 +68,7 @@ Item
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
} }
popupItem: Column popupItem: Column

7
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -132,6 +132,7 @@ Cura.ExpandableComponent
visible: UM.SimulationView.compatibilityMode visible: UM.SimulationView.compatibilityMode
height: UM.Theme.getSize("layerview_row").height height: UM.Theme.getSize("layerview_row").height
width: parent.width width: parent.width
renderType: Text.NativeRendering
} }
Item // Spacer Item // Spacer
@ -188,7 +189,7 @@ Cura.ExpandableComponent
leftMargin: UM.Theme.getSize("checkbox").width + Math.round(UM.Theme.getSize("default_margin").width / 2) leftMargin: UM.Theme.getSize("checkbox").width + Math.round(UM.Theme.getSize("default_margin").width / 2)
rightMargin: UM.Theme.getSize("default_margin").width * 2 rightMargin: UM.Theme.getSize("default_margin").width * 2
} }
renderType: Text.NativeRendering
} }
} }
} }
@ -254,6 +255,7 @@ Cura.ExpandableComponent
text: label text: label
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
elide: Text.ElideRight elide: Text.ElideRight
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: legendModelCheckBox.left anchors.left: legendModelCheckBox.left
@ -310,7 +312,7 @@ Cura.ExpandableComponent
width: parent.width width: parent.width
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
Rectangle Rectangle
{ {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -357,6 +359,7 @@ Cura.ExpandableComponent
anchors.left: parent.left anchors.left: parent.left
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
} }
Label Label

1
resources/qml/ExtruderIcon.qml
View file

@ -53,6 +53,7 @@ Item
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight
visible: extruderEnabled visible: extruderEnabled
renderType: Text.NativeRendering
} }
UM.RecolorImage UM.RecolorImage

3
resources/qml/MachineSelector.qml
View file

@ -33,6 +33,7 @@ Cura.ExpandableComponent
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
} }
popupItem: Item popupItem: Item
@ -60,6 +61,7 @@ Cura.ExpandableComponent
height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0 height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
@ -103,6 +105,7 @@ Cura.ExpandableComponent
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
Repeater Repeater

1
resources/qml/PrintSetupSelector.qml
View file

@ -182,6 +182,7 @@ Cura.ExpandableComponent
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering
elide: Text.ElideRight elide: Text.ElideRight
color: color:
{ {
if(control.pressed) if(control.pressed)