summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorMichael Alexsander Silva Dias <michaelalexsander@protonmail.com>2019-08-18 13:27:08 -0300
committerMichael Alexsander Silva Dias <michaelalexsander@protonmail.com>2019-08-18 13:27:08 -0300
commitc19a66d72f9bee4783515d7681040096867f6c8f (patch)
tree31a8f0abe9d49a811fc773a019d883b949f24f96 /editor
parentef37f00525643e391e19b79f84fc6fd15762b3be (diff)
Simplify structure of preview text in visual shader editor
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/visual_shader_editor_plugin.cpp22
-rw-r--r--editor/plugins/visual_shader_editor_plugin.h3
2 files changed, 8 insertions, 17 deletions
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;