summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-11-08 10:54:36 +0100
committerRémi Verschelde <rverschelde@gmail.com>2019-11-08 10:54:36 +0100
commit3c0c8f26f91b96703adf298d903d0229afa6955f (patch)
tree49e1072d1490b7d6590fd9700e4d2965f3677c16
parent621dc7022f9b9e09790481d8915858fa4d007ba4 (diff)
Revert "Fixed TouchScreenButton::shape_centered having no effect"
This reverts commit 127c2d75ad109fe4a905f9061fcbc25d1e8b0ca9. This was a misunderstanding as #32725 is not a bug but expected behavior. Reverts #32927. Supersedes and closes #33436.
-rw-r--r--scene/2d/touch_screen_button.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp
index cf68528388..9a1a759e72 100644
--- a/scene/2d/touch_screen_button.cpp
+++ b/scene/2d/touch_screen_button.cpp
@@ -325,12 +325,8 @@ void TouchScreenButton::_release(bool p_exiting_tree) {
}
Rect2 TouchScreenButton::_edit_get_rect() const {
- if (texture.is_null()) {
- if (shape.is_valid())
- return shape->get_rect();
- else
- return CanvasItem::_edit_get_rect();
- }
+ if (texture.is_null())
+ return CanvasItem::_edit_get_rect();
return Rect2(Size2(), texture->get_size());
}