diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-05 21:59:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 21:59:12 +0200 |
| commit | 8625313330994e8a4e8a8beced840bf8c5b8697d (patch) | |
| tree | 4db3dfc88240baaaa8aa2d3ce81908b3a7d4b6d5 | |
| parent | 08dd03589931859b8e038e831e71f060584fc6d3 (diff) | |
| parent | 2ef29d35bdbbd89b6482983d17c2ccb2ed9cc1ca (diff) | |
Merge pull request #22753 from bugfi5h/master
Fix to ColorPicker behaviour when entering html. Fixing Issue #22714
| -rw-r--r-- | scene/gui/color_picker.cpp | 3 |
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; |