asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix TextureButton focus texture logic

Browse source 
(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 c2a9de23f5
commit 99195cc163
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; Point2 ofs;
Size2 size; 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()) { if (texdraw.is_valid()) {
size = texdraw->get_size(); size = texdraw->get_size();
@ -224,7 +230,9 @@ void TextureButton::_notification(int p_what) {
size.width *= hflip ? -1.0f : 1.0f; size.width *= hflip ? -1.0f : 1.0f;
size.height *= vflip ? -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); draw_texture_rect(texdraw, Rect2(ofs, size), _tile);
} else { } else {
draw_texture_rect_region(texdraw, Rect2(ofs, size), _texture_region); draw_texture_rect_region(texdraw, Rect2(ofs, size), _texture_region);
@ -233,7 +241,7 @@ void TextureButton::_notification(int p_what) {
_position_rect = Rect2(); _position_rect = Rect2();
} }
if (has_focus() && focused.is_valid()) { if (draw_focus) {
draw_texture_rect(focused, Rect2(ofs, size), false); draw_texture_rect(focused, Rect2(ofs, size), false);
}; };
} break; } break;