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

Improve the Mono build log appearance 

Co-authored-by: Raul Santos <raulsntos@gmail.com>
This commit is contained in:
Yuri Sizov 2021-08-03 21:45:25 +03:00
parent c78880ff54
commit ac9db4c676
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_themes.cpp
View File

@ -156,6 +156,7 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme =
ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#a5b7f3", "#3d64dd"); // 2d ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#a5b7f3", "#3d64dd"); // 2d
ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#708cea", "#1a3eac"); // 2d dark ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#708cea", "#1a3eac"); // 2d dark
ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#a5efac", "#2fa139"); // control ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#a5efac", "#2fa139"); // control
ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ffdd65", "#ca8a04"); // node warning
// rainbow // rainbow
ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff7070", "#ff2929"); // red ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff7070", "#ff2929"); // red
@ -229,7 +230,6 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme =
exceptions.insert("StatusError"); exceptions.insert("StatusError");
exceptions.insert("StatusSuccess"); exceptions.insert("StatusSuccess");
exceptions.insert("StatusWarning"); exceptions.insert("StatusWarning");
exceptions.insert("NodeWarning");
exceptions.insert("OverbrightIndicator"); exceptions.insert("OverbrightIndicator");
} }
@ -956,6 +956,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_icon("folded", "TextEdit", theme->get_icon("GuiTreeArrowRight", "EditorIcons")); theme->set_icon("folded", "TextEdit", theme->get_icon("GuiTreeArrowRight", "EditorIcons"));
theme->set_icon("fold", "TextEdit", theme->get_icon("GuiTreeArrowDown", "EditorIcons")); theme->set_icon("fold", "TextEdit", theme->get_icon("GuiTreeArrowDown", "EditorIcons"));
theme->set_color("font_color", "TextEdit", font_color); theme->set_color("font_color", "TextEdit", font_color);
theme->set_color("font_color_readonly", "TextEdit", font_color_readonly);
theme->set_color("caret_color", "TextEdit", font_color); theme->set_color("caret_color", "TextEdit", font_color);
theme->set_color("selection_color", "TextEdit", font_color_selection); theme->set_color("selection_color", "TextEdit", font_color_selection);

24
modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs
View File

@ -11,6 +11,7 @@ namespace GodotTools.Build
{ {
public BuildOutputView BuildOutputView { get; private set; } public BuildOutputView BuildOutputView { get; private set; }
private MenuButton buildMenuBtn;
private Button errorsBtn; private Button errorsBtn;
private Button warningsBtn; private Button warningsBtn;
private Button viewLogBtn; private Button viewLogBtn;
@ -56,7 +57,7 @@ namespace GodotTools.Build
BuildManager.GenerateEditorScriptMetadata(); BuildManager.GenerateEditorScriptMetadata();
if (!BuildManager.BuildProjectBlocking("Debug", targets: new[] {"Rebuild"})) if (!BuildManager.BuildProjectBlocking("Debug", targets: new[] { "Rebuild" }))
return; // Build failed return; // Build failed
// Notify running game for hot-reload // Notify running game for hot-reload
@ -75,7 +76,7 @@ namespace GodotTools.Build
if (!File.Exists(GodotSharpDirs.ProjectSlnPath)) if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
return; // No solution to build return; // No solution to build
BuildManager.BuildProjectBlocking("Debug", targets: new[] {"Clean"}); BuildManager.BuildProjectBlocking("Debug", targets: new[] { "Clean" });
} }
private void ViewLogToggled(bool pressed) => BuildOutputView.LogVisible = pressed; private void ViewLogToggled(bool pressed) => BuildOutputView.LogVisible = pressed;
@ -112,10 +113,10 @@ namespace GodotTools.Build
RectMinSize = new Vector2(0, 228) * EditorScale; RectMinSize = new Vector2(0, 228) * EditorScale;
SizeFlagsVertical = (int)SizeFlags.ExpandFill; SizeFlagsVertical = (int)SizeFlags.ExpandFill;
var toolBarHBox = new HBoxContainer {SizeFlagsHorizontal = (int)SizeFlags.ExpandFill}; var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill };
AddChild(toolBarHBox); AddChild(toolBarHBox);
var buildMenuBtn = new MenuButton {Text = "Build", Icon = GetIcon("Play", "EditorIcons")}; buildMenuBtn = new MenuButton { Text = "Build", Icon = GetIcon("Play", "EditorIcons") };
toolBarHBox.AddChild(buildMenuBtn); toolBarHBox.AddChild(buildMenuBtn);
var buildMenu = buildMenuBtn.GetPopup(); var buildMenu = buildMenuBtn.GetPopup();
@ -161,5 +162,20 @@ namespace GodotTools.Build
BuildOutputView = new BuildOutputView(); BuildOutputView = new BuildOutputView();
AddChild(BuildOutputView); AddChild(BuildOutputView);
} }
public override void _Notification(int what)
{
base._Notification(what);
if (what == NotificationThemeChanged)
{
if (buildMenuBtn != null)
buildMenuBtn.Icon = GetIcon("Play", "EditorIcons");
if (errorsBtn != null)
errorsBtn.Icon = GetIcon("StatusError", "EditorIcons");
if (warningsBtn != null)
warningsBtn.Icon = GetIcon("NodeWarning", "EditorIcons");
}
}
} }
} }