summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. K <rene.kling1992@gmail.com>2018-10-05 08:15:41 +0200
committerR.K <rene.kling@agentilo.com>2018-10-05 13:04:23 +0200
commit2ef29d35bdbbd89b6482983d17c2ccb2ed9cc1ca (patch)
tree1585ca5809fd64710aad1f3e695e64b10df2643e
parent8068d0217a5e74c25f83fe93fa6e077b8d0b3bf5 (diff)
Fix to ColorPicker behaviour when entering html.
-rw-r--r--scene/gui/color_picker.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 03eee9c6d8..c5d3def4c1 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -159,7 +159,10 @@ void ColorPicker::_html_entered(const String &p_html) {
if (updating)
return;
+ float last_alpha = color.a;
color = Color::html(p_html);
+ if (!is_editing_alpha())
+ color.a = last_alpha;
if (!is_inside_tree())
return;