Skip to content

Commit 89cf746

Browse files
committed
Merge pull request #103489 from YeldhamDev/cam_override_stretch_fix
Fix wrong canvas camera override panning in the runtime debugger
2 parents df65b34 + 186d825 commit 89cf746

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

scene/debugger/scene_debugger.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
14251425
bool is_dragging_camera = false;
14261426
if (camera_override) {
14271427
if (node_select_type == NODE_TYPE_2D) {
1428-
is_dragging_camera = panner->gui_input(p_event, Rect2(Vector2(), root->get_size()));
1428+
is_dragging_camera = panner->gui_input(p_event, Rect2(Vector2(), root->get_visible_rect().get_size()));
14291429
} else if (node_select_type == NODE_TYPE_3D && selection_drag_state == SELECTION_DRAG_NONE) {
14301430
#ifndef _3D_DISABLED
14311431
if (_handle_3d_input(p_event)) {
@@ -2214,8 +2214,9 @@ void RuntimeNodeSelect::_find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_
22142214
}
22152215

22162216
void RuntimeNodeSelect::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) {
2217-
view_2d_offset.x -= p_scroll_vec.x / view_2d_zoom;
2218-
view_2d_offset.y -= p_scroll_vec.y / view_2d_zoom;
2217+
Vector2 scroll = SceneTree::get_singleton()->get_root()->get_screen_transform().affine_inverse().xform(p_scroll_vec);
2218+
view_2d_offset.x -= scroll.x / view_2d_zoom;
2219+
view_2d_offset.y -= scroll.y / view_2d_zoom;
22192220

22202221
_update_view_2d();
22212222
}

0 commit comments

Comments
 (0)