godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00
Code Releases Wiki Activity

Merge pull request #33440 from akien-mga/revert-32927

Browse Source 
Revert "Fixed TouchScreenButton::shape_centered having no effect"
This commit is contained in:
Rémi Verschelde
2019-11-08 12:27:48 +01:00
committed by GitHub
parent 621dc7022f 3c0c8f26f9
commit be15a016f4
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/2d/touch_screen_button.cpp
View File

@@ -325,12 +325,8 @@ void TouchScreenButton::_release(bool p_exiting_tree) {
} }
Rect2 TouchScreenButton::_edit_get_rect() const { Rect2 TouchScreenButton::_edit_get_rect() const {
if (texture.is_null()) { if (texture.is_null())
if (shape.is_valid()) return CanvasItem::_edit_get_rect();
return shape->get_rect();
else
return CanvasItem::_edit_get_rect();
}
return Rect2(Size2(), texture->get_size()); return Rect2(Size2(), texture->get_size());
} }