diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-08 20:50:41 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-08 20:50:41 +0100 |
| commit | 515567d491a6045a8786366f6bb85ab391aa681b (patch) | |
| tree | d4f34267986889a69667b2d332f916edb25aa1a9 | |
| parent | e3d4a851b7e1707d9068a9294b3bf26ad0845b35 (diff) | |
| parent | 514eed407282c19e61f461f88d99dc627f417701 (diff) | |
Merge pull request #3282 from TheHX/pr-script-debugger
Fix debugger close button and script editor "Show Debugger"
| -rw-r--r-- | tools/editor/plugins/script_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/script_editor_debugger.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index ded27d1fef..6c36c71e93 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -2413,7 +2413,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { 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("Keep Debuger Open",DEBUG_SHOW_KEEP_OPEN); + debug_menu->get_popup()->add_check_item("Keep Debugger Open",DEBUG_SHOW_KEEP_OPEN); debug_menu->get_popup()->connect("item_pressed", this,"_menu_option"); debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true); diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp index fb821573f9..aad89d1272 100644 --- a/tools/editor/script_editor_debugger.cpp +++ b/tools/editor/script_editor_debugger.cpp @@ -569,8 +569,8 @@ void ScriptEditorDebugger::_notification(int p_what) { ppeer->set_stream_peer(connection); - show(); + emit_signal("show_debugger",true); dobreak->set_disabled(false); tabs->set_current_tab(0); @@ -770,6 +770,7 @@ void ScriptEditorDebugger::_stack_dump_frame_selected() { void ScriptEditorDebugger::_hide_request() { + hide(); emit_signal("show_debugger",false); } |