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

Fix TextureButton focus texture logic 

(cherry picked from commit 11111d997e)
This commit is contained in:
kobewi 2022-01-04 00:45:24 +01:00 committed by Rémi Verschelde
parent 4a83366185
commit f0cbd12ea8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/texture_button.cpp
View File

@ -168,6 +168,12 @@ void TextureButton::_notification(int p_what) {
Point2 ofs;
Size2 size;
bool draw_focus = (has_focus() && focused.is_valid());
// If no other texture is valid, try using focused texture.
if (!texdraw.is_valid() && draw_focus) {
texdraw = focused;
}
if (texdraw.is_valid()) {
size = texdraw->get_size();
@ -224,7 +230,9 @@ void TextureButton::_notification(int p_what) {
size.width *= hflip ? -1.0f : 1.0f;
size.height *= vflip ? -1.0f : 1.0f;
if (_tile) {
if (texdraw == focused) {
// Do nothing, we only needed to calculate the rectangle.
} else if (_tile) {
draw_texture_rect(texdraw, Rect2(ofs, size), _tile);
} else {
draw_texture_rect_region(texdraw, Rect2(ofs, size), _texture_region);
@ -233,7 +241,7 @@ void TextureButton::_notification(int p_what) {
_position_rect = Rect2();
}
if (has_focus() && focused.is_valid()) {
if (draw_focus) {
draw_texture_rect(focused, Rect2(ofs, size), false);
};
} break;