diff options
| author | Juan Linietsky | 2015-01-03 01:26:22 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-01-03 01:26:22 -0300 |
| commit | eb1f978b1c1693018e9a6d353ca914f8e6586b4e (patch) | |
| tree | dd33542356623a5b2c553ca5d1c5f1ef0b24ed63 /scene/gui/texture_button.cpp | |
| parent | 60afd79a6e2354e0254c280d826bc6f12f68ffa1 (diff) | |
| parent | c83a00c603c84eeac2188cae6b4986c3b86a05c6 (diff) | |
| download | godot-eb1f978b1c1693018e9a6d353ca914f8e6586b4e.tar.gz godot-eb1f978b1c1693018e9a6d353ca914f8e6586b4e.tar.zst godot-eb1f978b1c1693018e9a6d353ca914f8e6586b4e.zip | |
Merge pull request #1101 from romulox-x/texturebutton_scale_2d
Changed texturebutton scale from float to Size2
Diffstat (limited to 'scene/gui/texture_button.cpp')
| -rw-r--r-- | scene/gui/texture_button.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index e8967927c..1a7087b7e 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -53,6 +53,10 @@ Size2 TextureButton::get_minimum_size() const { bool TextureButton::has_point(const Point2& p_point) const { + if (scale[0] <= 0 || scale[1] <= 0) { + return false; + } + Point2 ppos = p_point/scale; if (click_mask.is_valid()) { @@ -159,7 +163,7 @@ void TextureButton::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/disabled",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_disabled_texture"), _SCS("get_disabled_texture")); ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/focused",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_focused_texture"), _SCS("get_focused_texture")); ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"textures/click_mask",PROPERTY_HINT_RESOURCE_TYPE,"BitMap"), _SCS("set_click_mask"), _SCS("get_click_mask")) ; - ADD_PROPERTY(PropertyInfo(Variant::REAL,"params/scale",PROPERTY_HINT_RANGE,"0.01,1024,0.01"), _SCS("set_scale"), _SCS("get_scale")); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2,"params/scale",PROPERTY_HINT_RANGE,"0.01,1024,0.01"), _SCS("set_scale"), _SCS("get_scale")); ADD_PROPERTY(PropertyInfo(Variant::COLOR,"params/modulate"), _SCS("set_modulate"), _SCS("get_modulate")); } @@ -228,15 +232,14 @@ void TextureButton::set_focused_texture(const Ref<Texture>& p_focused) { focused = p_focused; }; -void TextureButton::set_scale(float p_scale) { +void TextureButton::set_scale(Size2 p_scale) { - ERR_FAIL_COND(p_scale<=0); scale=p_scale; minimum_size_changed(); update(); } -float TextureButton::get_scale() const{ +Size2 TextureButton::get_scale() const{ return scale; } @@ -252,6 +255,6 @@ Color TextureButton::get_modulate() const { TextureButton::TextureButton() { - scale=1.0; + scale=Size2(1.0, 1.0); modulate=Color(1,1,1); } |