diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-08 12:27:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 12:27:48 +0100 |
| commit | be15a016f40e1317f70bb93c27ce0d1b1701f46b (patch) | |
| tree | 49e1072d1490b7d6590fd9700e4d2965f3677c16 /scene | |
| parent | 621dc7022f9b9e09790481d8915858fa4d007ba4 (diff) | |
| parent | 3c0c8f26f91b96703adf298d903d0229afa6955f (diff) | |
Merge pull request #33440 from akien-mga/revert-32927
Revert "Fixed TouchScreenButton::shape_centered having no effect"
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/touch_screen_button.cpp | 8 |
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()); } |