Merge branch 'master' of https://github.com/godotengine/godot

3 files changed, 19 insertions, 6 deletions

diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 742a115c5f..4332ba57a3 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -605,6 +605,7 @@ void ScriptEditor::_show_debugger(bool p_show) {
 
 	debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), p_show);
 
+	debugger->set_always_visible(p_show);
 }
 
 void ScriptEditor::_script_created(Ref<Script> p_script) {
@@ -1350,7 +1351,6 @@ void ScriptEditor::_menu_option(int p_option) {
 					debugger->debug_continue();
 
 			} break;
-
 			case HELP_CONTEXTUAL: {
 				String text = current->get_text_edit()->get_selection_text();
 				if (text == "")
diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index cb54968c15..cd265e3704 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -570,11 +570,12 @@ void ScriptEditorDebugger::_notification(int p_what) {
 					ppeer->set_stream_peer(connection);
 
 
-					show();
+					if (!always_visible)
+						show();
+
 					dobreak->set_disabled(false);
 					tabs->set_current_tab(0);
 
-					emit_signal("show_debugger",true);
 					reason->set_text("Child Process Connected");
 					reason->set_tooltip("Child Process Connected");
 					scene_tree->clear();
@@ -770,9 +771,7 @@ void ScriptEditorDebugger::_stack_dump_frame_selected() {
 
 void ScriptEditorDebugger::_hide_request() {
 
-	hide();
 	emit_signal("show_debugger",false);
-
 }
 
 void ScriptEditorDebugger::_output_clear() {
@@ -1162,10 +1161,23 @@ void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
 
 }
 
+<<<<<<< HEAD
 void ScriptEditorDebugger::set_hide_on_stop(bool p_hide) {
 
 	hide_on_stop=p_hide;
 }
+=======
+void ScriptEditorDebugger::set_always_visible(bool p_visible) {
+
+	always_visible=p_visible;
+
+	if (p_visible)
+		show();
+	else
+		hide();
+}
+
+>>>>>>> c3db5d951c1ee938a0c789c78a9bb8045ef8605b
 
 void ScriptEditorDebugger::_bind_methods() {
 
@@ -1461,6 +1473,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	add_child(msgdialog);
 
 	hide();
+	always_visible=false;
 	log_forced_visible=false;
 
 	p_editor->get_undo_redo()->set_method_notify_callback(_method_changeds,this);
diff --git a/tools/editor/script_editor_debugger.h b/tools/editor/script_editor_debugger.h
index fc44540cc4..906714d13c 100644
--- a/tools/editor/script_editor_debugger.h
+++ b/tools/editor/script_editor_debugger.h
@@ -81,6 +81,7 @@ class ScriptEditorDebugger : public Control {
 	TabContainer *tabs;
 
 	Label *reason;
+	bool always_visible;
 	bool log_forced_visible;
 	ScriptEditorDebuggerVariables *variables;
 
@@ -186,7 +187,6 @@ public:
 
 	void set_hide_on_stop(bool p_hide);
 
-
 	virtual Size2 get_minimum_size() const;
 	ScriptEditorDebugger(EditorNode *p_editor=NULL);
 	~ScriptEditorDebugger();