asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7364 from guilhermefelipecgs/fix_bottom_panel_visibility_on_play

Browse source 
Fix bottom panel visibility on play
This commit is contained in:
Rémi Verschelde 2017-01-02 15:54:26 +01:00 committed by GitHub
commit ac04a932d6
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/editor/editor_node.cpp
View file

@ -1922,6 +1922,9 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
log->clear(); log->clear();
} }
if (bool(EDITOR_DEF("run/always_open_output_on_play", true))) {
make_bottom_panel_item_visible(log);
}
List<String> breakpoints; List<String> breakpoints;
editor_data.get_editor_breakpoints(&breakpoints); editor_data.get_editor_breakpoints(&breakpoints);

15
tools/editor/script_editor_debugger.cpp
View file

@ -581,7 +581,6 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
//LOG //LOG
if (EditorNode::get_log()->is_hidden()) { if (EditorNode::get_log()->is_hidden()) {
log_forced_visible=true;
if (EditorNode::get_singleton()->are_bottom_panels_hidden()) { if (EditorNode::get_singleton()->are_bottom_panels_hidden()) {
EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log()); EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log());
} }
@ -957,7 +956,6 @@ void ScriptEditorDebugger::_notification(int p_what) {
break; break;
EditorNode::get_log()->add_message("** Debug Process Started **"); EditorNode::get_log()->add_message("** Debug Process Started **");
log_forced_visible=false;
ppeer->set_stream_peer(connection); ppeer->set_stream_peer(connection);
@ -1089,8 +1087,8 @@ void ScriptEditorDebugger::start() {
stop(); stop();
if (!EditorNode::get_log()->is_visible()) { if (is_visible()) {
EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log()); EditorNode::get_singleton()->make_bottom_panel_item_visible(this);
} }
uint16_t port = GLOBAL_DEF("debug/remote_port",6007); uint16_t port = GLOBAL_DEF("debug/remote_port",6007);
@ -1132,13 +1130,6 @@ void ScriptEditorDebugger::stop(){
pending_in_queue=0; pending_in_queue=0;
message.clear(); message.clear();
if (log_forced_visible) {
//EditorNode::get_singleton()->make_bottom_panel_item_visible(this);
if (EditorNode::get_log()->is_visible())
EditorNode::get_singleton()->hide_bottom_panel();
log_forced_visible=false;
}
node_path_cache.clear(); node_path_cache.clear();
res_path_cache.clear(); res_path_cache.clear();
profiler_signature.clear(); profiler_signature.clear();
@ -1980,8 +1971,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
msgdialog = memnew( AcceptDialog ); msgdialog = memnew( AcceptDialog );
add_child(msgdialog); add_child(msgdialog);
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);
p_editor->get_undo_redo()->set_property_notify_callback(_property_changeds,this); p_editor->get_undo_redo()->set_property_notify_callback(_property_changeds,this);
live_debug=false; live_debug=false;

1
tools/editor/script_editor_debugger.h
View file

@ -96,7 +96,6 @@ class ScriptEditorDebugger : public Control {
TabContainer *tabs; TabContainer *tabs;
LineEdit *reason; LineEdit *reason;
bool log_forced_visible;
ScriptEditorDebuggerVariables *variables; ScriptEditorDebuggerVariables *variables;
Button *step; Button *step;