diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 3 | ||||
| -rw-r--r-- | editor/plugins/visual_shader_editor_plugin.cpp | 22 | ||||
| -rw-r--r-- | editor/plugins/visual_shader_editor_plugin.h | 3 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 3 |
4 files changed, 14 insertions, 17 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 311f8b295b..5ec071d71a 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5512,6 +5512,9 @@ EditorNode::EditorNode() { } } + // Define a minimum window size to prevent UI elements from overlapping or being cut off + OS::get_singleton()->set_min_window_size(Size2(1024, 600) * EDSCALE); + ResourceLoader::set_abort_on_missing_resources(false); FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files")); EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files")); diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index c2ee82d1c0..619fb15a68 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -2050,9 +2050,9 @@ void VisualShaderEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da } } -void VisualShaderEditor::_show_preview_panel() { +void VisualShaderEditor::_show_preview_text() { preview_showed = !preview_showed; - preview_panel->set_visible(preview_showed); + preview_text->set_visible(preview_showed); } void VisualShaderEditor::_update_preview() { @@ -2098,7 +2098,7 @@ void VisualShaderEditor::_bind_methods() { ClassDB::bind_method("_node_resized", &VisualShaderEditor::_node_resized); ClassDB::bind_method("_set_node_size", &VisualShaderEditor::_set_node_size); ClassDB::bind_method("_clear_buffer", &VisualShaderEditor::_clear_buffer); - ClassDB::bind_method("_show_preview_panel", &VisualShaderEditor::_show_preview_panel); + ClassDB::bind_method("_show_preview_text", &VisualShaderEditor::_show_preview_text); ClassDB::bind_method("_update_preview", &VisualShaderEditor::_update_preview); ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &VisualShaderEditor::get_drag_data_fw); @@ -2195,28 +2195,20 @@ VisualShaderEditor::VisualShaderEditor() { preview_shader->set_toggle_mode(true); preview_shader->set_tooltip(TTR("Show resulted shader code.")); graph->get_zoom_hbox()->add_child(preview_shader); - preview_shader->connect("pressed", this, "_show_preview_panel"); + preview_shader->connect("pressed", this, "_show_preview_text"); /////////////////////////////////////// // PREVIEW PANEL /////////////////////////////////////// - preview_panel = memnew(PanelContainer); - main_box->add_child(preview_panel); - - VBoxContainer *preview_vb = memnew(VBoxContainer); - preview_panel->add_child(preview_vb); - preview_vb->set_h_size_flags(SIZE_EXPAND_FILL); - preview_vb->set_v_size_flags(SIZE_EXPAND_FILL); preview_text = memnew(TextEdit); + main_box->add_child(preview_text); preview_text->set_h_size_flags(SIZE_EXPAND_FILL); preview_text->set_v_size_flags(SIZE_EXPAND_FILL); + preview_text->set_visible(preview_showed); + preview_text->set_custom_minimum_size(Size2(400 * EDSCALE, 0)); preview_text->set_syntax_coloring(true); preview_text->set_readonly(true); - preview_vb->add_child(preview_text); - - preview_panel->set_visible(preview_showed); - preview_panel->set_custom_minimum_size(Size2(400 * EDSCALE, 0)); /////////////////////////////////////// // SHADER NODES TREE diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h index aa2a4681de..1556c7cd43 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/plugins/visual_shader_editor_plugin.h @@ -70,7 +70,6 @@ class VisualShaderEditor : public VBoxContainer { PanelContainer *error_panel; Label *error_label; - PanelContainer *preview_panel; TextEdit *preview_text; UndoRedo *undo_redo; @@ -153,7 +152,7 @@ class VisualShaderEditor : public VBoxContainer { void _update_custom_nodes(); void _update_options_menu(); - void _show_preview_panel(); + void _show_preview_text(); void _update_preview(); static VisualShaderEditor *singleton; diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 0f3c4c924a..2b62482550 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -2270,6 +2270,9 @@ ProjectManager::ProjectManager() { } break; } + // Define a minimum window size to prevent UI elements from overlapping or being cut off + OS::get_singleton()->set_min_window_size(Size2(750, 420) * EDSCALE); + #ifndef OSX_ENABLED // The macOS platform implementation uses its own hiDPI window resizing code // TODO: Resize windows on hiDPI displays on Windows and Linux and remove the line below |