Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-12 21:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Linietsky 2015-12-12 10:14:13 -03:00
commit a2d817405e
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -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 == "")

21
tools/editor/script_editor_debugger.cpp
View File

@ -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);

2
tools/editor/script_editor_debugger.h
View File

@ -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();