godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #3435 from neikeq/output_focus_steal

Browse Source 
Fix Output panel annoying focus steal
This commit is contained in:
Juan Linietsky
2016-01-25 00:30:14 -03:00
parent 16b8b97472 a3e4914355
commit 31a4762fea
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/editor_node.cpp
View File

@@ -4592,6 +4592,16 @@ ToolButton *EditorNode::add_bottom_panel_item(String p_text,Control *p_item) {
} }
bool EditorNode::are_bottom_panels_hidden() const {
for(int i=0;i<bottom_panel_items.size();i++) {
if (bottom_panel_items[i].button->is_pressed())
return false;
}
return true;
}
void EditorNode::hide_bottom_panel() { void EditorNode::hide_bottom_panel() {
_bottom_panel_switch(false,0); _bottom_panel_switch(false,0);

1
tools/editor/editor_node.h
View File

@@ -670,6 +670,7 @@ public:
ToolButton* add_bottom_panel_item(String p_text,Control *p_item); ToolButton* add_bottom_panel_item(String p_text,Control *p_item);
bool are_bottom_panels_hidden() const;
void make_bottom_panel_item_visible(Control *p_item); void make_bottom_panel_item_visible(Control *p_item);
void raise_bottom_panel_item(Control *p_item); void raise_bottom_panel_item(Control *p_item);
void hide_bottom_panel(); void hide_bottom_panel();

4
tools/editor/script_editor_debugger.cpp
View File

@@ -360,7 +360,9 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
if (EditorNode::get_log()->is_hidden()) { if (EditorNode::get_log()->is_hidden()) {
log_forced_visible=true; log_forced_visible=true;
EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log()); if (EditorNode::get_singleton()->are_bottom_panels_hidden()) {
EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log());
}
} }
EditorNode::get_log()->add_message(t); EditorNode::get_log()->add_message(t);