From f99de3f024394e8fa567e9c0ee4295bb3629b732 Mon Sep 17 00:00:00 2001 From: Robert Yevdokimov Date: Thu, 7 Mar 2024 16:02:33 -0500 Subject: [PATCH] Move `snap_controls_to_pixels` from process to projects settings changed method --- editor/plugins/canvas_item_editor_plugin.cpp | 7 +++++-- editor/plugins/canvas_item_editor_plugin.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 2ab53effed7..a7112f3f60a 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -3911,16 +3911,19 @@ void CanvasItemEditor::_update_editor_settings() { warped_panning = bool(EDITOR_GET("editors/panning/warped_mouse_panning")); } +void CanvasItemEditor::_project_settings_changed() { + EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels")); +} + void CanvasItemEditor::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: { EditorRunBar::get_singleton()->connect("play_pressed", callable_mp(this, &CanvasItemEditor::_update_override_camera_button).bind(true)); EditorRunBar::get_singleton()->connect("stop_pressed", callable_mp(this, &CanvasItemEditor::_update_override_camera_button).bind(false)); + ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &CanvasItemEditor::_project_settings_changed)); } break; case NOTIFICATION_PROCESS: { - EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels")); - int nb_having_pivot = 0; // Update the viewport if the canvas_item changes diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 723dbc7f593..073e67d8b2d 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -483,6 +483,8 @@ private: void _focus_selection(int p_op); void _reset_drag(); + void _project_settings_changed(); + SnapTarget snap_target[2]; Transform2D snap_transform; void _snap_if_closer_float(