diff options
author | Ghostkeeper <rubend@tutanota.com> | 2018-12-03 13:59:03 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2018-12-03 13:59:03 +0300 |
commit | 65d3aa44802c740d06c19ebbc58a2e9f2732ee80 (patch) | |
tree | bd2f20b68b910157d1aab1efebaef2d4eed8bbe5 /resources/qml | |
parent | c8cb3a094a216eac21b139ba6577541ea53046d1 (diff) |
Fix broken sizes due to merged theme entry
Merge conflict went wrong, I think.
Contributes to issue CURA-5876.
Diffstat (limited to 'resources/qml')
-rw-r--r-- | resources/qml/ActionPanel/OutputProcessWidget.qml | 2 | ||||
-rw-r--r-- | resources/qml/ActionPanel/SliceProcessWidget.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml index 3a85a13810..8ce5d13f17 100644 --- a/resources/qml/ActionPanel/OutputProcessWidget.qml +++ b/resources/qml/ActionPanel/OutputProcessWidget.qml @@ -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") diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index dee099bc88..1143bb4c1a 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -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 { |