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

Fix broken sizes due to merged theme entry

Browse source 
Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-12-03 11:59:03 +01:00
parent c8cb3a094a
commit 65d3aa4480
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -111,7 +111,7 @@ Column
{ {
id: previewStageShortcut id: previewStageShortcut
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
text: catalog.i18nc("@button", "Preview") text: catalog.i18nc("@button", "Preview")
onClicked: UM.Controller.setActiveStage("PreviewStage") onClicked: UM.Controller.setActiveStage("PreviewStage")

2
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -101,7 +101,7 @@ Column
// Disable the slice process when // Disable the slice process when
width: parent.width width: parent.width
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_button").height
visible: !autoSlice visible: !autoSlice
Cura.PrimaryButton Cura.PrimaryButton
{ {