From 3c0c8f26f91b96703adf298d903d0229afa6955f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 8 Nov 2019 10:54:36 +0100 Subject: [PATCH] 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. --- scene/2d/touch_screen_button.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index cf685283887..9a1a759e720 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()); }