From 805b4dbe4cfa76aa79f697f9d39de5db22dce1f0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 29 Jan 2019 13:28:32 +0100 Subject: [PATCH] Fixed height for action message buttons CURA-6115 --- resources/qml/Cura.qml | 2 ++ resources/themes/cura-light/theme.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 8de982115b..98356181cb 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -379,6 +379,7 @@ UM.MainWindow Cura.PrimaryButton { text: model.name + height: UM.Theme.getSize("message_action_button").height } } @@ -387,6 +388,7 @@ UM.MainWindow Cura.SecondaryButton { text: model.name + height: UM.Theme.getSize("message_action_button").height } } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index c4491d1c08..beabe3b4f7 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -504,7 +504,7 @@ "button_icon": [2.5, 2.5], "button_lining": [0, 0], - "action_button": [15.0, 2.0], + "action_button": [15.0, 2.5], "action_button_icon": [1.0, 1.0], "action_button_radius": [0.15, 0.15], @@ -561,6 +561,7 @@ "message": [30.0, 5.0], "message_close": [1, 1], "message_radius": [0.25, 0.25], + "message_action_button": [0, 2.0], "infill_button_margin": [0.5, 0.5],