From 74a48a0140262ebd3a818a75b7d102cf0fe2eeae Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 17 Jan 2016 20:03:57 -0300 Subject: -Massive editor dialog cleanup -Added a bottom menu list --- tools/editor/plugins/script_editor_plugin.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tools/editor/plugins/script_editor_plugin.cpp') diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 8adfe9d2c..1e16f32e6 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -2321,12 +2321,9 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { menu_hb = memnew( HBoxContainer ); add_child(menu_hb); - v_split = memnew( VSplitContainer ); - add_child(v_split); - v_split->set_v_size_flags(SIZE_EXPAND_FILL); script_split = memnew( HSplitContainer ); - v_split->add_child(script_split); + add_child(script_split); script_split->set_v_size_flags(SIZE_EXPAND_FILL); script_list = memnew( ItemList ); @@ -2416,7 +2413,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { debug_menu->get_popup()->add_item("Break",DEBUG_BREAK); debug_menu->get_popup()->add_item("Continue",DEBUG_CONTINUE); debug_menu->get_popup()->add_separator(); - debug_menu->get_popup()->add_check_item("Show Debugger",DEBUG_SHOW); + //debug_menu->get_popup()->add_check_item("Show Debugger",DEBUG_SHOW); debug_menu->get_popup()->add_check_item("Keep Debugger Open",DEBUG_SHOW_KEEP_OPEN); debug_menu->get_popup()->connect("item_pressed", this,"_menu_option"); @@ -2545,7 +2542,11 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { quick_open->connect("goto_line",this,"_goto_script_line2"); - v_split->add_child(debugger); + + Button *db = EditorNode::get_singleton()->add_bottom_panel_item("Debugger",debugger); + debugger->set_tool_button(db); + + debugger->connect("breaked",this,"_breaked"); autosave_timer = memnew( Timer ); -- cgit v1.2.3-70-g09d2