summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-01-31 14:53:22 +0100
committerGitHub <noreply@github.com>2022-01-31 14:53:22 +0100
commit777c8217485b7ead6534966c511b2388c55bca04 (patch)
tree1b9263bc222fd2d400b447b5af39e25620079a55 /scene
parent7cb25c2870247e6c5aeed986c88204752a7faaf5 (diff)
parentc317a9735981e03a8c230916617503ca006f0a08 (diff)
Merge pull request #57462 from mashumafi/master-fix-button-icon-alpha3
Fix button icon_disabled_color alpha channel
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/button.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index 552dd28513..3ed1b873af 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -197,6 +197,8 @@ void Button::_notification(int p_what) {
color = get_theme_color(SNAME("font_disabled_color"));
if (has_theme_color(SNAME("icon_disabled_color"))) {
color_icon = get_theme_color(SNAME("icon_disabled_color"));
+ } else {
+ color_icon.a = 0.4;
}
} break;
@@ -232,9 +234,6 @@ void Button::_notification(int p_what) {
}
if (!_icon.is_null()) {
int valign = size.height - style->get_minimum_size().y;
- if (is_disabled()) {
- color_icon.a = 0.4;
- }
float icon_ofs_region = 0.0;
Point2 style_offset;