godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Script debugger remains visible when using Debug->Show Debugger

Browse Source
This commit is contained in:
Franklin Sobrinho 2015-12-12 10:00:12 -03:00
parent 990690f9f5
commit 4d644ca997
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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); 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) { void ScriptEditor::_script_created(Ref<Script> p_script) {
@ -1338,11 +1339,7 @@ void ScriptEditor::_menu_option(int p_option) {
case DEBUG_SHOW: { case DEBUG_SHOW: {
if (debugger) { if (debugger) {
bool visible = debug_menu->get_popup()->is_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW) ); bool visible = debug_menu->get_popup()->is_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW) );
debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), !visible); _show_debugger(!visible);
if (visible)
debugger->hide();
else
debugger->show();
} }
} break; } break;
case HELP_CONTEXTUAL: { case HELP_CONTEXTUAL: {

20
tools/editor/script_editor_debugger.cpp
View File

@ -570,11 +570,12 @@ void ScriptEditorDebugger::_notification(int p_what) {
ppeer->set_stream_peer(connection); ppeer->set_stream_peer(connection);
if (!always_visible)
show(); show();
dobreak->set_disabled(false); dobreak->set_disabled(false);
tabs->set_current_tab(0); tabs->set_current_tab(0);
emit_signal("show_debugger",true);
reason->set_text("Child Process Connected"); reason->set_text("Child Process Connected");
reason->set_tooltip("Child Process Connected"); reason->set_tooltip("Child Process Connected");
scene_tree->clear(); scene_tree->clear();
@ -736,10 +737,8 @@ void ScriptEditorDebugger::stop(){
le_clear->set_disabled(false); le_clear->set_disabled(false);
le_set->set_disabled(true); le_set->set_disabled(true);
if (!always_visible)
hide(); hide();
emit_signal("show_debugger",false);
} }
@ -768,9 +767,7 @@ void ScriptEditorDebugger::_stack_dump_frame_selected() {
void ScriptEditorDebugger::_hide_request() { void ScriptEditorDebugger::_hide_request() {
hide();
emit_signal("show_debugger",false); emit_signal("show_debugger",false);
} }
void ScriptEditorDebugger::_output_clear() { void ScriptEditorDebugger::_output_clear() {
@ -1160,6 +1157,16 @@ void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
} }
void ScriptEditorDebugger::set_always_visible(bool p_visible) {
always_visible=p_visible;
if (p_visible)
show();
else
hide();
}
void ScriptEditorDebugger::_bind_methods() { void ScriptEditorDebugger::_bind_methods() {
@ -1455,6 +1462,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
add_child(msgdialog); add_child(msgdialog);
hide(); hide();
always_visible=false;
log_forced_visible=false; log_forced_visible=false;
p_editor->get_undo_redo()->set_method_notify_callback(_method_changeds,this); p_editor->get_undo_redo()->set_method_notify_callback(_method_changeds,this);

2
tools/editor/script_editor_debugger.h
View File

@ -79,6 +79,7 @@ class ScriptEditorDebugger : public Control {
TabContainer *tabs; TabContainer *tabs;
Label *reason; Label *reason;
bool always_visible;
bool log_forced_visible; bool log_forced_visible;
ScriptEditorDebuggerVariables *variables; ScriptEditorDebuggerVariables *variables;
@ -182,6 +183,7 @@ public:
void update_live_edit_root(); void update_live_edit_root();
void set_always_visible(bool p_visible);
virtual Size2 get_minimum_size() const; virtual Size2 get_minimum_size() const;
ScriptEditorDebugger(EditorNode *p_editor=NULL); ScriptEditorDebugger(EditorNode *p_editor=NULL);