1 files changed, 15 insertions, 23 deletions

diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp
index 514eff358e..58e7249284 100644
--- a/scene/gui/texture_rect.cpp
+++ b/scene/gui/texture_rect.cpp
@@ -30,12 +30,10 @@
 
 #include "texture_rect.h"
 #include "core/core_string_names.h"
-#include "servers/visual_server.h"
+#include "servers/rendering_server.h"
 
 void TextureRect::_notification(int p_what) {
-
 	if (p_what == NOTIFICATION_DRAW) {
-
 		if (texture.is_null()) {
 			return;
 		}
@@ -95,6 +93,15 @@ void TextureRect::_notification(int p_what) {
 			} break;
 		}
 
+		Ref<AtlasTexture> p_atlas = texture;
+
+		if (p_atlas.is_valid() && region.has_no_area()) {
+			Size2 scale_size(size.width / texture->get_width(), size.height / texture->get_height());
+
+			offset.width += hflip ? p_atlas->get_margin().get_position().width * scale_size.width * 2 : 0;
+			offset.height += vflip ? p_atlas->get_margin().get_position().height * scale_size.height * 2 : 0;
+		}
+
 		size.width *= hflip ? -1.0f : 1.0f;
 		size.height *= vflip ? -1.0f : 1.0f;
 
@@ -107,7 +114,6 @@ void TextureRect::_notification(int p_what) {
 }
 
 Size2 TextureRect::get_minimum_size() const {
-
 	if (!expand && !texture.is_null()) {
 		return texture->get_size();
 	} else {
@@ -116,7 +122,6 @@ Size2 TextureRect::get_minimum_size() const {
 }
 
 void TextureRect::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_texture", "texture"), &TextureRect::set_texture);
 	ClassDB::bind_method(D_METHOD("get_texture"), &TextureRect::get_texture);
 	ClassDB::bind_method(D_METHOD("set_expand", "enable"), &TextureRect::set_expand);
@@ -127,9 +132,8 @@ void TextureRect::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_flipped_v"), &TextureRect::is_flipped_v);
 	ClassDB::bind_method(D_METHOD("set_stretch_mode", "stretch_mode"), &TextureRect::set_stretch_mode);
 	ClassDB::bind_method(D_METHOD("get_stretch_mode"), &TextureRect::get_stretch_mode);
-	ClassDB::bind_method(D_METHOD("_texture_changed"), &TextureRect::_texture_changed);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "expand"), "set_expand", "has_expand");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "stretch_mode", PROPERTY_HINT_ENUM, "Scale On Expand (Compat),Scale,Tile,Keep,Keep Centered,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), "set_stretch_mode", "get_stretch_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_h"), "set_flip_h", "is_flipped_h");
@@ -146,85 +150,73 @@ void TextureRect::_bind_methods() {
 }
 
 void TextureRect::_texture_changed() {
-
 	if (texture.is_valid()) {
 		update();
 		minimum_size_changed();
 	}
 }
 
-void TextureRect::set_texture(const Ref<Texture> &p_tex) {
-
+void TextureRect::set_texture(const Ref<Texture2D> &p_tex) {
 	if (p_tex == texture) {
 		return;
 	}
 
 	if (texture.is_valid()) {
-		texture->disconnect(CoreStringNames::get_singleton()->changed, this, "_texture_changed");
+		texture->disconnect(CoreStringNames::get_singleton()->changed, callable_mp(this, &TextureRect::_texture_changed));
 	}
 
 	texture = p_tex;
 
 	if (texture.is_valid()) {
-		texture->connect(CoreStringNames::get_singleton()->changed, this, "_texture_changed");
+		texture->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &TextureRect::_texture_changed));
 	}
 
 	update();
 	minimum_size_changed();
 }
 
-Ref<Texture> TextureRect::get_texture() const {
-
+Ref<Texture2D> TextureRect::get_texture() const {
 	return texture;
 }
 
 void TextureRect::set_expand(bool p_expand) {
-
 	expand = p_expand;
 	update();
 	minimum_size_changed();
 }
 
 bool TextureRect::has_expand() const {
-
 	return expand;
 }
 
 void TextureRect::set_stretch_mode(StretchMode p_mode) {
-
 	stretch_mode = p_mode;
 	update();
 }
 
 TextureRect::StretchMode TextureRect::get_stretch_mode() const {
-
 	return stretch_mode;
 }
 
 void TextureRect::set_flip_h(bool p_flip) {
-
 	hflip = p_flip;
 	update();
 }
 
 bool TextureRect::is_flipped_h() const {
-
 	return hflip;
 }
 
 void TextureRect::set_flip_v(bool p_flip) {
-
 	vflip = p_flip;
 	update();
 }
 
 bool TextureRect::is_flipped_v() const {
-
 	return vflip;
 }
 
 TextureRect::TextureRect() {
-
 	expand = false;
 	hflip = false;
 	vflip = false;