2 files changed, 58 insertions, 3 deletions

diff --git a/scene/gui/texture_frame.cpp b/scene/gui/texture_frame.cpp
index 73fecf591a..2fe8735fda 100644
--- a/scene/gui/texture_frame.cpp
+++ b/scene/gui/texture_frame.cpp
@@ -37,9 +37,31 @@ void TextureFrame::_notification(int p_what) {
 			return;
 
 
-		Size2 s=expand?get_size():texture->get_size();
+
 		RID ci = get_canvas_item();
-		draw_texture_rect(texture,Rect2(Point2(),s),false,modulate);
+
+		switch(stretch_mode) {
+			case STRETCH_SCALE_ON_EXPAND: {
+				Size2 s=expand?get_size():texture->get_size();
+				draw_texture_rect(texture,Rect2(Point2(),s),false,modulate);
+			} break;
+			case STRETCH_SCALE: {
+				draw_texture_rect(texture,Rect2(Point2(),get_size()),false,modulate);
+			} break;
+			case STRETCH_TILE: {
+				draw_texture_rect(texture,Rect2(Point2(),get_size()),true,modulate);
+			} break;
+			case STRETCH_KEEP: {
+				draw_texture_rect(texture,Rect2(Point2(),texture->get_size()),false,modulate);
+
+			} break;
+			case STRETCH_KEEP_CENTERED: {
+
+				Vector2 ofs = (get_size() - texture->get_size())/2;
+				draw_texture_rect(texture,Rect2(ofs,texture->get_size()),false,modulate);
+			} break;
+		}
+
 
 /*
 		Vector<Point2> points;
@@ -76,11 +98,19 @@ void TextureFrame::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_modulate"), & TextureFrame::get_modulate );
 	ObjectTypeDB::bind_method(_MD("set_expand","enable"), & TextureFrame::set_expand );
 	ObjectTypeDB::bind_method(_MD("has_expand"), & TextureFrame::has_expand );
+	ObjectTypeDB::bind_method(_MD("set_stretch_mode","stretch_mode"), & TextureFrame::set_stretch_mode );
+	ObjectTypeDB::bind_method(_MD("get_stretch_mode"), & TextureFrame::get_stretch_mode );
 
 	ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_texture"),_SCS("get_texture") );
 	ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), _SCS("set_modulate"),_SCS("get_modulate") );
 	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "expand" ), _SCS("set_expand"),_SCS("has_expand") );
+	ADD_PROPERTYNO( PropertyInfo( Variant::INT, "stretch_mode",PROPERTY_HINT_ENUM,"Scale On Expand (Compat),Scale,Tile,Keep,Keep Centered"), _SCS("set_stretch_mode"),_SCS("get_stretch_mode") );
 
+	BIND_CONSTANT( STRETCH_SCALE_ON_EXPAND );
+	BIND_CONSTANT( STRETCH_SCALE );
+	BIND_CONSTANT( STRETCH_TILE );
+	BIND_CONSTANT( STRETCH_KEEP );
+	BIND_CONSTANT( STRETCH_KEEP_CENTERED );
 }
 
 
@@ -121,12 +151,24 @@ bool TextureFrame::has_expand() const {
 	return expand;
 }
 
+void TextureFrame::set_stretch_mode(StretchMode p_mode) {
+
+	stretch_mode=p_mode;
+	update();
+}
+
+TextureFrame::StretchMode TextureFrame::get_stretch_mode() const {
+
+	return stretch_mode;
+}
+
 TextureFrame::TextureFrame() {
 
 
 	expand=false;
 	modulate=Color(1,1,1,1);
 	set_ignore_mouse(true);
+	stretch_mode=STRETCH_SCALE_ON_EXPAND;
 }
 
 
diff --git a/scene/gui/texture_frame.h b/scene/gui/texture_frame.h
index e1f0de92df..a4acf588ea 100644
--- a/scene/gui/texture_frame.h
+++ b/scene/gui/texture_frame.h
@@ -36,10 +36,19 @@
 class TextureFrame : public Control {
 
 	OBJ_TYPE(TextureFrame,Control);
-
+public:
+	enum StretchMode {
+		STRETCH_SCALE_ON_EXPAND, //default, for backwards compatibility
+		STRETCH_SCALE,
+		STRETCH_TILE,
+		STRETCH_KEEP,
+		STRETCH_KEEP_CENTERED,
+	};
+private:
 	bool expand;
 	Color modulate;
 	Ref<Texture> texture;
+	StretchMode stretch_mode;
 protected:
 
 	void _notification(int p_what);
@@ -57,9 +66,13 @@ public:
 	void set_expand(bool p_expand);
 	bool has_expand() const;
 
+	void set_stretch_mode(StretchMode p_mode);
+	StretchMode get_stretch_mode() const;
+
 	TextureFrame();
 	~TextureFrame();
 
 };
 
+VARIANT_ENUM_CAST( TextureFrame::StretchMode );
 #endif // TEXTURE_FRAME_H