aboutsummaryrefslogtreecommitdiff
path: root/scene/2d/canvas_item.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2016-01-02 11:23:30 -0300
committerJuan Linietsky2016-01-02 11:23:30 -0300
commitd069c44a7fb0dc2c1939babed58fd02783856d9e (patch)
tree4322d92fff3661caecd6686ccb687c8046d7de32 /scene/2d/canvas_item.cpp
parentb60371074f359591493a015aeb5b4a4f0d70da16 (diff)
downloadgodot-d069c44a7fb0dc2c1939babed58fd02783856d9e.tar.gz
godot-d069c44a7fb0dc2c1939babed58fd02783856d9e.tar.zst
godot-d069c44a7fb0dc2c1939babed58fd02783856d9e.zip
-Fix TouchScreenButton to work with stretch and viewport canvas transform, closes #2286
Diffstat (limited to 'scene/2d/canvas_item.cpp')
-rw-r--r--scene/2d/canvas_item.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index 8f6df43c7..adb3574dd 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -389,8 +389,8 @@ Matrix32 CanvasItem::get_global_transform_with_canvas() const {
if (last_valid->canvas_layer)
return last_valid->canvas_layer->get_transform() * xform;
- else
- return xform;
+ else if (is_inside_tree())
+ return get_viewport()->get_canvas_transform() * xform;
}
Matrix32 CanvasItem::get_global_transform() const {