Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #97620 from jj11hh/master

Browse source 
[Visual Shader] Fix nodes' relative positions changed in a different display scale.
This commit is contained in:
Rémi Verschelde 2025-12-01 11:48:05 +01:00
commit 1575e3da90
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/shader/visual_shader_editor_plugin.cpp
View file

@ -539,7 +539,7 @@ void VisualShaderGraphPlugin::update_frames(VisualShader::Type p_type, int p_nod
void VisualShaderGraphPlugin::set_node_position(VisualShader::Type p_type, int p_id, const Vector2 &p_position) {
if (editor->get_current_shader_type() == p_type && links.has(p_id)) {
links[p_id].graph_element->set_position_offset(p_position);
links[p_id].graph_element->set_position_offset(p_position * editor->cached_theme_base_scale);
}
}
@ -736,7 +736,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id, bool
expression = expression_node->get_expression();
}
node->set_position_offset(visual_shader->get_node_position(p_type, p_id));
node->set_position_offset(visual_shader->get_node_position(p_type, p_id) * editor->cached_theme_base_scale);
node->connect("dragged", callable_mp(editor, &VisualShaderEditor::_node_dragged).bind(p_id));
@ -4174,7 +4174,7 @@ void VisualShaderEditor::_update_varyings() {
void VisualShaderEditor::_node_dragged(const Vector2 &p_from, const Vector2 &p_to, int p_node) {
VisualShader::Type type = get_current_shader_type();
drag_buffer.push_back({ type, p_node, p_from, p_to });
drag_buffer.push_back({ type, p_node, p_from / cached_theme_base_scale, p_to / cached_theme_base_scale });
if (!drag_dirty) {
callable_mp(this, &VisualShaderEditor::_nodes_dragged).call_deferred();
}
@ -5346,6 +5346,8 @@ void VisualShaderEditor::_notification(int p_what) {
tools->set_button_icon(get_editor_theme_icon(SNAME("Tools")));
preview_tools->set_button_icon(get_editor_theme_icon(SNAME("Tools")));
cached_theme_base_scale = get_theme_default_base_scale();
if (is_visible_in_tree()) {
_update_graph();
} else {

2
editor/shader/visual_shader_editor_plugin.h
View file

@ -290,6 +290,8 @@ class VisualShaderEditor : public ShaderEditor {
VBoxContainer *param_vbox = nullptr;
VBoxContainer *param_vbox2 = nullptr;
float cached_theme_base_scale = 1.0f;
enum ShaderModeFlags {
MODE_FLAGS_SPATIAL_CANVASITEM = 1,
MODE_FLAGS_SKY = 2,