summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-10-22 15:53:29 +0200
committerGitHub <noreply@github.com>2019-10-22 15:53:29 +0200
commit4ecc30cc5ed04c770efd79c2c9f2b1dc9ae0af39 (patch)
treecf4f5a955b573ed42e8cd1426ee2dc27a09c34df
parent1be39232b4294f1a1f253426978ab8ed2954b05a (diff)
parent127c2d75ad109fe4a905f9061fcbc25d1e8b0ca9 (diff)
Merge pull request #32927 from Muller-Castro/ShapeCenteredFix
Fixed TouchScreenButton::shape_centered having no effect
-rw-r--r--scene/2d/touch_screen_button.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp
index 9a1a759e72..cf68528388 100644
--- a/scene/2d/touch_screen_button.cpp
+++ b/scene/2d/touch_screen_button.cpp
@@ -325,8 +325,12 @@ void TouchScreenButton::_release(bool p_exiting_tree) {
}
Rect2 TouchScreenButton::_edit_get_rect() const {
- if (texture.is_null())
- return CanvasItem::_edit_get_rect();
+ if (texture.is_null()) {
+ if (shape.is_valid())
+ return shape->get_rect();
+ else
+ return CanvasItem::_edit_get_rect();
+ }
return Rect2(Size2(), texture->get_size());
}