Add scale property back for backwards compatibility

now we have a choice
Fix textureframe modulate doesn't work with STRETCH_KEEP_ASPECT_CENTERED and STRETCH_KEEP_ASPECT

3 files changed, 89 insertions, 39 deletions

diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index 581875d40..18d3f9072 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -31,7 +31,7 @@
 Size2 TextureButton::get_minimum_size() const {
 
 	Size2 size = Control::get_minimum_size();
-	if(!expand) {
+	if(resize_mode == RESIZE_SCALE) {
 		if (normal.is_null()) {
 			if (pressed.is_null()) {
 				if (hover.is_null())
@@ -45,15 +45,19 @@ Size2 TextureButton::get_minimum_size() const {
 				size=pressed->get_size();
 		} else
 			size=normal->get_size();
+		size=size*scale.abs();
 	}
 	return size;
 }
 
 bool TextureButton::has_point(const Point2& p_point) const {
-
+	if ( resize_mode == RESIZE_SCALE &&  (scale[0] == 0 || scale[1] == 0)) {
+		return false;
+	}
+	Point2 ppos = (resize_mode == RESIZE_SCALE) ? (p_point/scale.abs()) : p_point;
 	if (click_mask.is_valid()) {
 
-		Point2i p = p_point;
+		Point2i p = ppos;
 		if (p.x<0 || p.x>=click_mask->get_size().width || p.y<0 || p.y>=click_mask->get_size().height)
 			return false;
 
@@ -116,25 +120,25 @@ void TextureButton::_notification(int p_what) {
 				Size2 size = texdraw->get_size();
 				Rect2 tex_regin = Rect2(Point2(), texdraw->get_size());
 				bool tile = false;
-				if(expand) {
+				if(resize_mode == RESIZE_STRETCH) {
 					switch (stretch_mode) {
-						case TextureFrame::STRETCH_KEEP:
+						case STRETCH_KEEP:
 							size = texdraw->get_size();
 							break;
-						case TextureFrame::STRETCH_SCALE_ON_EXPAND:
-						case TextureFrame::STRETCH_SCALE:
+						case STRETCH_SCALE_ON_EXPAND:
+						case STRETCH_SCALE:
 							size = get_size();
 							break;
-						case TextureFrame::STRETCH_TILE:
+						case STRETCH_TILE:
 							size = get_size();
 							tile = true;
 							break;
-						case TextureFrame::STRETCH_KEEP_CENTERED:
+						case STRETCH_KEEP_CENTERED:
 							ofs = (get_size() - texdraw->get_size())/2;
 							size = texdraw->get_size();
 							break;
-						case TextureFrame::STRETCH_KEEP_ASPECT_CENTERED:
-						case TextureFrame::STRETCH_KEEP_ASPECT: {
+						case STRETCH_KEEP_ASPECT_CENTERED:
+						case STRETCH_KEEP_ASPECT: {
 							Size2 _size=get_size();
 							float tex_width = texdraw->get_width() * _size.height / texdraw->get_height();
 							float tex_height = _size.height;
@@ -144,14 +148,14 @@ void TextureButton::_notification(int p_what) {
 								tex_height = texdraw->get_height() * tex_width / texdraw->get_width();
 							}
 
-							if (stretch_mode==TextureFrame::STRETCH_KEEP_ASPECT_CENTERED) {
+							if (stretch_mode==STRETCH_KEEP_ASPECT_CENTERED) {
 								ofs.x = (_size.width - tex_width)/2;
 								ofs.y = (_size.height - tex_height)/2;
 							}
 							size.width = tex_width;
 							size.height = tex_height;
 						} break;
-						case TextureFrame::STRETCH_KEEP_ASPECT_COVERED:{
+						case STRETCH_KEEP_ASPECT_COVERED:{
 							size = get_size();
 							Size2 tex_size = texdraw->get_size();
 							Size2 scaleSize(size.width/tex_size.width, size.height/tex_size.height);
@@ -162,6 +166,9 @@ void TextureButton::_notification(int p_what) {
 						} break;
 					}
 				}
+				else {
+					size = texdraw->get_size()*scale;
+				}
 				if (tile)
 					draw_texture_rect(texdraw,Rect2(ofs,size),tile,modulate);
 				else
@@ -185,9 +192,10 @@ void TextureButton::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_disabled_texture","texture:Texture"),&TextureButton::set_disabled_texture);
 	ObjectTypeDB::bind_method(_MD("set_focused_texture","texture:Texture"),&TextureButton::set_focused_texture);
 	ObjectTypeDB::bind_method(_MD("set_click_mask","mask:BitMap"),&TextureButton::set_click_mask);
+	ObjectTypeDB::bind_method(_MD("set_texture_scale","scale"),&TextureButton::set_texture_scale);
 	ObjectTypeDB::bind_method(_MD("set_modulate","color"),&TextureButton::set_modulate);
-	ObjectTypeDB::bind_method(_MD("set_expand","enable"), &TextureButton::set_expand);
-	ObjectTypeDB::bind_method(_MD("set_stretch_mode","stretch_mode"), & TextureButton::set_stretch_mode );
+	ObjectTypeDB::bind_method(_MD("set_resize_mode","p_mode"), &TextureButton::set_resize_mode);
+	ObjectTypeDB::bind_method(_MD("set_stretch_mode","p_mode"), & TextureButton::set_stretch_mode );
 
 	ObjectTypeDB::bind_method(_MD("get_normal_texture:Texture"),&TextureButton::get_normal_texture);
 	ObjectTypeDB::bind_method(_MD("get_pressed_texture:Texture"),&TextureButton::get_pressed_texture);
@@ -195,21 +203,30 @@ void TextureButton::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_disabled_texture:Texture"),&TextureButton::get_disabled_texture);
 	ObjectTypeDB::bind_method(_MD("get_focused_texture:Texture"),&TextureButton::get_focused_texture);
 	ObjectTypeDB::bind_method(_MD("get_click_mask:BitMap"),&TextureButton::get_click_mask);
+	ObjectTypeDB::bind_method(_MD("get_texture_scale"),&TextureButton::get_texture_scale);
 	ObjectTypeDB::bind_method(_MD("get_modulate"),&TextureButton::get_modulate);
-	ObjectTypeDB::bind_method(_MD("has_expand"), & TextureButton::has_expand);
+	ObjectTypeDB::bind_method(_MD("get_resize_mode"), & TextureButton::get_resize_mode);
 	ObjectTypeDB::bind_method(_MD("get_stretch_mode"), &TextureButton::get_stretch_mode);
 
-
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/normal",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_normal_texture"), _SCS("get_normal_texture"));
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/pressed",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_pressed_texture"), _SCS("get_pressed_texture"));
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/hover",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_hover_texture"), _SCS("get_hover_texture"));
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/disabled",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_disabled_texture"), _SCS("get_disabled_texture"));
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/focused",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_focused_texture"), _SCS("get_focused_texture"));
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/click_mask",PROPERTY_HINT_RESOURCE_TYPE,"BitMap"), _SCS("set_click_mask"), _SCS("get_click_mask")) ;
-	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,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), _SCS("set_stretch_mode"),_SCS("get_stretch_mode"));
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "params/resize_mode",PROPERTY_HINT_ENUM,"Scale (Compat),Stretch"), _SCS("set_resize_mode"), _SCS("get_resize_mode"));
+	ADD_PROPERTYNO(PropertyInfo(Variant::VECTOR2,"params/scale",PROPERTY_HINT_RANGE,"0.01,1024,0.01"), _SCS("set_texture_scale"), _SCS("get_texture_scale"));
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "params/stretch_mode",PROPERTY_HINT_ENUM,"Scale On Expand (Compat),Scale,Tile,Keep,Keep Centered,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), _SCS("set_stretch_mode"),_SCS("get_stretch_mode"));
+	ADD_PROPERTYNO(PropertyInfo(Variant::COLOR,"params/modulate"), _SCS("set_modulate"), _SCS("get_modulate"));
 
+	BIND_CONSTANT(STRETCH_SCALE_ON_EXPAND);
+	BIND_CONSTANT(STRETCH_SCALE);
+	BIND_CONSTANT(STRETCH_TILE);
+	BIND_CONSTANT(STRETCH_KEEP);
+	BIND_CONSTANT(STRETCH_KEEP_CENTERED);
+	BIND_CONSTANT(STRETCH_KEEP_ASPECT);
+	BIND_CONSTANT(STRETCH_KEEP_ASPECT_CENTERED);
+	BIND_CONSTANT(STRETCH_KEEP_ASPECT_COVERED);
 }
 
 
@@ -285,27 +302,39 @@ Color TextureButton::get_modulate() const {
 	return modulate;
 }
 
-void TextureButton::set_expand(bool expand) {
-	this->expand = expand;
+TextureButton::ResizeMode TextureButton::get_resize_mode() const {
+	return resize_mode;
+}
+
+void TextureButton::set_resize_mode(TextureButton::ResizeMode p_mode) {
+	resize_mode = p_mode;
+	minimum_size_changed();
+	update();
+}
+
+void TextureButton::set_texture_scale(Size2 p_scale) {
+	scale = p_scale;
+	minimum_size_changed();
 	update();
 }
 
-bool TextureButton::has_expand() const {
-	return expand;
+Size2 TextureButton::get_texture_scale() const {
+	return scale;
 }
 
-void TextureButton::set_stretch_mode(TextureFrame::StretchMode stretch_mode) {
-	this->stretch_mode = stretch_mode;
+void TextureButton::set_stretch_mode(TextureButton::StretchMode p_mode) {
+	stretch_mode = p_mode;
 	update();
 }
 
-TextureFrame::StretchMode TextureButton::get_stretch_mode() const {
+TextureButton::StretchMode TextureButton::get_stretch_mode() const {
 	return stretch_mode;
 }
 
 
 TextureButton::TextureButton() {
 	modulate=Color(1,1,1);
-	expand=false;
-	stretch_mode=TextureFrame::STRETCH_KEEP;
+	resize_mode=RESIZE_SCALE;
+	scale=Size2(1.0, 1.0);
+	stretch_mode=STRETCH_SCALE_ON_EXPAND;
 }
diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h
index 1f971ce84..84651880a 100644
--- a/scene/gui/texture_button.h
+++ b/scene/gui/texture_button.h
@@ -31,11 +31,28 @@
 
 #include "scene/gui/base_button.h"
 #include "scene/resources/bit_mask.h"
-#include "scene/gui/texture_frame.h"
+
 class TextureButton : public BaseButton {
 
 	OBJ_TYPE( TextureButton, BaseButton );
+public:
+	enum ResizeMode {
+		RESIZE_SCALE, // for backwards compatibility
+		RESIZE_STRETCH,
+	};
 
+	enum StretchMode {
+		STRETCH_SCALE_ON_EXPAND, //default, for backwards compatibility
+		STRETCH_SCALE,
+		STRETCH_TILE,
+		STRETCH_KEEP,
+		STRETCH_KEEP_CENTERED,
+		STRETCH_KEEP_ASPECT,
+		STRETCH_KEEP_ASPECT_CENTERED,
+		STRETCH_KEEP_ASPECT_COVERED,
+	};
+
+private:
 	Ref<Texture> normal;
 	Ref<Texture> pressed;
 	Ref<Texture> hover;
@@ -43,8 +60,9 @@ class TextureButton : public BaseButton {
 	Ref<Texture> focused;
 	Ref<BitMap> click_mask;
 	Color modulate;
-	bool expand;
-	TextureFrame::StretchMode stretch_mode;
+	ResizeMode resize_mode;
+	Size2 scale;
+	StretchMode stretch_mode;
 
 protected:
 
@@ -72,13 +90,18 @@ public:
 	void set_modulate(const Color& p_modulate);
 	Color get_modulate() const;
 
-	void set_expand(bool expand);
-	bool has_expand() const;
+	ResizeMode get_resize_mode() const;
+	void set_resize_mode(ResizeMode p_mode);
+
+	void set_texture_scale(Size2 p_scale);
+	Size2 get_texture_scale() const;
 
-	void set_stretch_mode(TextureFrame::StretchMode stretch_mode);
-	TextureFrame::StretchMode get_stretch_mode() const;
+	void set_stretch_mode(StretchMode stretch_mode);
+	StretchMode get_stretch_mode() const;
 
 	TextureButton();
 };
 
+VARIANT_ENUM_CAST( TextureButton::ResizeMode );
+VARIANT_ENUM_CAST( TextureButton::StretchMode );
 #endif // TEXTURE_BUTTON_H
diff --git a/scene/gui/texture_frame.cpp b/scene/gui/texture_frame.cpp
index bc30737cb..278fff996 100644
--- a/scene/gui/texture_frame.cpp
+++ b/scene/gui/texture_frame.cpp
@@ -77,7 +77,7 @@ void TextureFrame::_notification(int p_what) {
 					ofs_y+=(size.height - tex_height)/2;
 				}
 
-				draw_texture_rect(texture,Rect2(ofs_x,ofs_y,tex_width,tex_height));
+				draw_texture_rect(texture,Rect2(ofs_x,ofs_y,tex_width,tex_height),false,modulate);
 			} break;
 			case STRETCH_KEEP_ASPECT_COVERED: {
 
@@ -191,5 +191,3 @@ TextureFrame::TextureFrame() {
 TextureFrame::~TextureFrame()
 {
 }
-
-