# HG changeset patch # User Alys Brooks # Date 2021-07-02 04:53:34 # Node ID 4c810f7d6a3094b8874132ed3304ca17ad66790f # Parent faf69fd3a7dbf20a96ecb5bd8718d4edb97094fe Fix identation. diff --git a/isometric-park-fna/UI/MainMenu.cs b/isometric-park-fna/UI/MainMenu.cs --- a/isometric-park-fna/UI/MainMenu.cs +++ b/isometric-park-fna/UI/MainMenu.cs @@ -10,45 +10,43 @@ namespace isometricparkfna.UI { - public static class MainMenu - { - + public static class MainMenu + { + - public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine bridgeEngine - /*ImFontPtr smallFont, GameBridgeEngine bridgeEngine */ //, ref bool quit, ref bool paused, ref int rate, ref bool showBudget, string header - ) - { - //Has to go first so the measurement is correct: - ImGui.PushFont(font); + public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine bridgeEngine) + { + //Has to go first so the measurement is correct: + ImGui.PushFont(font); - ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; - bool newShow = true; + ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; + bool newShow = true; - Num.Vector2 text_size = ImGui.CalcTextSize("Quit to Main Menu"); - Num.Vector2 button_size = new Num.Vector2((int)text_size.X*1.1f, - (int)text_size.Y*1.25f+5); + Num.Vector2 text_size = ImGui.CalcTextSize("Quit to Main Menu"); + Num.Vector2 button_size = new Num.Vector2((int)text_size.X*1.1f, + (int)text_size.Y*1.25f+5); - StyleSets.defaultSet.push(); + StyleSets.defaultSet.push(); - ImGui.Begin("##Toolbar", ref newShow, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar); + ImGui.Begin("##Toolbar", ref newShow, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar); - if (ImGui.Button("New Game", button_size)) - { - bridgeEngine.gameStateMessages.Add(new GameStateMessage { isPlaying = true}); - } + if (ImGui.Button("New Game", button_size)) + { + bridgeEngine.gameStateMessages.Add(new GameStateMessage { isPlaying = true}); + } - if (ImGui.Button("Quit", button_size)) - { - System.Console.WriteLine("Quitting"); - Environment.Exit(0); - } + if (ImGui.Button("Quit", button_size)) + { + System.Console.WriteLine("Quitting"); + Environment.Exit(0); + } - ImGui.End(); - - ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; - StyleSets.defaultSet.pop(); - ImGui.PopFont(); - } - } + ImGui.End(); + + ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; + StyleSets.defaultSet.pop(); + ImGui.PopFont(); + } + } } diff --git a/isometric-park-fna/UI/Menu.cs b/isometric-park-fna/UI/Menu.cs --- a/isometric-park-fna/UI/Menu.cs +++ b/isometric-park-fna/UI/Menu.cs @@ -16,15 +16,15 @@ private static bool activeButton(string label, bool active, Num.Vector4 activeColor, Num.Vector4 activeTextColor) { if (active) { - ImGui.PushStyleColor(ImGuiCol.Button, activeColor); - ImGui.PushStyleColor(ImGuiCol.ButtonHovered, activeColor); - ImGui.PushStyleColor(ImGuiCol.Text, activeTextColor); + ImGui.PushStyleColor(ImGuiCol.Button, activeColor); + ImGui.PushStyleColor(ImGuiCol.ButtonHovered, activeColor); + ImGui.PushStyleColor(ImGuiCol.Text, activeTextColor); } var result = ImGui.Button(label); if (active) { - ImGui.PopStyleColor(3); + ImGui.PopStyleColor(3); } return result; @@ -35,21 +35,19 @@ ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; - StyleSets.defaultSet.push(); ImGui.PushStyleColor(ImGuiCol.MenuBarBg, StyleSets.grey); if (ImGui.BeginMainMenuBar()) { - ImGui.Text(header); ImGui.SetCursorPosX(width - 520); if (Menu.activeButton("\ue0c2 Contracts", bridgeEngine.windowStatuses[Window.Contracts], StyleSets.selected, StyleSets.white)) { - Logging.Trace("Contracts toggled."); - Logging.Spy(bridgeEngine.windowStatuses, "statuses"); + Logging.Trace("Contracts toggled."); + Logging.Spy(bridgeEngine.windowStatuses, "statuses"); bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Contracts}); } //Budget isn't connected to an entity yet: @@ -102,7 +100,6 @@ } #endif - ImGui.EndMainMenuBar(); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;