Merge pull request #57405 from kleonc/texture_button_focus_only_logic_fix

This commit is contained in:
Rémi Verschelde 2022-01-31 18:22:58 +01:00 committed by GitHub
commit 7da9e31f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -173,7 +173,8 @@ void TextureButton::_notification(int p_what) {
bool draw_focus = (has_focus() && focused.is_valid());
// If no other texture is valid, try using focused texture.
if (!texdraw.is_valid() && draw_focus) {
bool draw_focus_only = draw_focus && !texdraw.is_valid();
if (draw_focus_only) {
texdraw = focused;
}
@ -232,7 +233,7 @@ void TextureButton::_notification(int p_what) {
size.width *= hflip ? -1.0f : 1.0f;
size.height *= vflip ? -1.0f : 1.0f;
if (texdraw == focused) {
if (draw_focus_only) {
// Do nothing, we only needed to calculate the rectangle.
} else if (_tile) {
draw_texture_rect(texdraw, Rect2(ofs, size), _tile);