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

Show error icon at "Output" in case of errors

Browse source 
(cherry picked from commit 5120690013)
This commit is contained in:
Bernhard Liebl 2018-03-11 14:20:32 +01:00 committed by Hein-Pieter van Braam
parent dfe6d42a01
commit 4ce6a8f5f9
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/editor_log.cpp
View file

@ -88,6 +88,7 @@ void EditorLog::_notification(int p_what) {
void EditorLog::_clear_request() {
log->clear();
tool_button->set_icon(Ref<Texture>());
}
void EditorLog::clear() {
@ -103,9 +104,7 @@ void EditorLog::add_message(const String &p_msg, bool p_error) {
Ref<Texture> icon = get_icon("Error", "EditorIcons");
log->add_image(icon);
log->add_text(" ");
//button->set_icon(icon);
} else {
//button->set_icon(Ref<Texture>());
tool_button->set_icon(icon);
}
log->add_text(p_msg);
@ -115,6 +114,10 @@ void EditorLog::add_message(const String &p_msg, bool p_error) {
log->pop();
}
void EditorLog::set_tool_button(ToolButton *p_tool_button) {
tool_button = p_tool_button;
}
/*
void EditorLog::_dragged(const Point2& p_ofs) {

2
editor/editor_log.h
View file

@ -51,6 +51,7 @@ class EditorLog : public VBoxContainer {
RichTextLabel *log;
HBoxContainer *title_hb;
//PaneDrag *pd;
ToolButton *tool_button;
static void _error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, ErrorHandlerType p_type);
@ -68,6 +69,7 @@ protected:
public:
void add_message(const String &p_msg, bool p_error = false);
void set_tool_button(ToolButton *p_tool_button);
void deinit();
void clear();

3
editor/editor_node.cpp
View file

@ -5577,7 +5577,8 @@ EditorNode::EditorNode() {
bottom_panel_vb->add_child(bottom_panel_hb);
log = memnew(EditorLog);
add_bottom_panel_item(TTR("Output"), log);
ToolButton *output_button = add_bottom_panel_item(TTR("Output"), log);
log->set_tool_button(output_button);
old_split_ofs = 0;