From 6769f5343c0085ce109a2dbb0aa0e35b7da7f762 Mon Sep 17 00:00:00 2001 From: Michael Alexsander Date: Tue, 17 Feb 2026 13:08:56 -0300 Subject: [PATCH] Fix `ShaderEditor`'s UI overflowing when shrunk --- editor/shader/shader_editor.h | 6 +++--- editor/shader/text_shader_editor.h | 2 -- editor/shader/visual_shader_editor_plugin.cpp | 4 ---- editor/shader/visual_shader_editor_plugin.h | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/editor/shader/shader_editor.h b/editor/shader/shader_editor.h index ae4e86e1b7..f77e36019e 100644 --- a/editor/shader/shader_editor.h +++ b/editor/shader/shader_editor.h @@ -30,14 +30,14 @@ #pragma once -#include "scene/gui/control.h" +#include "scene/gui/margin_container.h" #include "scene/resources/shader.h" class Button; class MenuButton; -class ShaderEditor : public Control { - GDCLASS(ShaderEditor, Control); +class ShaderEditor : public MarginContainer { + GDCLASS(ShaderEditor, MarginContainer); public: virtual void edit_shader(const Ref &p_shader) = 0; diff --git a/editor/shader/text_shader_editor.h b/editor/shader/text_shader_editor.h index 891a669000..b53ea9035a 100644 --- a/editor/shader/text_shader_editor.h +++ b/editor/shader/text_shader_editor.h @@ -208,7 +208,5 @@ public: void tag_saved_version(); ShaderTextEditor *get_code_editor() { return code_editor; } - virtual Size2 get_minimum_size() const override { return Size2(0, 200); } - TextShaderEditor(); }; diff --git a/editor/shader/visual_shader_editor_plugin.cpp b/editor/shader/visual_shader_editor_plugin.cpp index 285a0b51f6..93b257eba0 100644 --- a/editor/shader/visual_shader_editor_plugin.cpp +++ b/editor/shader/visual_shader_editor_plugin.cpp @@ -2564,10 +2564,6 @@ void VisualShaderEditor::_set_mode(int p_which) { set_current_shader_type((VisualShader::Type)saved_type); } -Size2 VisualShaderEditor::get_minimum_size() const { - return Size2(10, 200); -} - void VisualShaderEditor::update_toggle_files_button() { ERR_FAIL_NULL(toggle_files_list); bool forward = toggle_files_list->is_visible() == is_layout_rtl(); diff --git a/editor/shader/visual_shader_editor_plugin.h b/editor/shader/visual_shader_editor_plugin.h index 3535925c15..a094714a32 100644 --- a/editor/shader/visual_shader_editor_plugin.h +++ b/editor/shader/visual_shader_editor_plugin.h @@ -684,7 +684,6 @@ public: Dictionary get_custom_node_data(Ref &p_custom_node); void update_custom_type(const Ref &p_resource); - virtual Size2 get_minimum_size() const override; virtual void update_toggle_files_button() override; Ref get_visual_shader() const { return visual_shader; }