GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 19:53:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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
height: UM.Theme.getSize("action_panel_button").height
height: UM.Theme.getSize("action_button").height
text: catalog.i18nc("@button", "Preview")
onClicked: UM.Controller.setActiveStage("PreviewStage")

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

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