godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22753 from bugfi5h/master 

Fix to ColorPicker behaviour when entering html. Fixing Issue #22714
This commit is contained in:
Rémi Verschelde 2018-10-05 21:59:12 +02:00 committed by GitHub
parent 08dd035899 2ef29d35bd
commit 8625313330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/color_picker.cpp
View File

@ -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;