From 11111d997ec248ff03cb1250c9dea9f9039e4f71 Mon Sep 17 00:00:00 2001
From: kobewi <kobewi4e@gmail.com>
Date: Tue, 4 Jan 2022 00:45:24 +0100
Subject: [PATCH] Fix TextureButton focus texture logic

---
 scene/gui/texture_button.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index 4c2229acb70..da202c1c8fb 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -170,6 +170,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();
@@ -226,7 +232,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);
@@ -235,7 +243,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;