diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index e550eb2d5540db9490a521bf474e6597feaadcf6..e9e6a1f995220f23b1e8b97d3101d3ea3f28c7d0 GIT binary patch literal 17897 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 OB4GC$5jvnhOZy)r)ig=~ 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 @@ -13,12 +13,12 @@ public const int MENU_BAR_HEIGHT = 20; - private static bool activeButton(string label, bool active, Num.Vector4 activeColor) { + 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, StyleSets.grey); + ImGui.PushStyleColor(ImGuiCol.Text, activeTextColor); } var result = ImGui.Button(label); @@ -36,7 +36,7 @@ ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; - StyleSets.defaultSet.push(); + StyleSets.defaultSet.push(); ImGui.PushStyleColor(ImGuiCol.MenuBarBg, StyleSets.grey); if (ImGui.BeginMainMenuBar()) @@ -46,56 +46,56 @@ ImGui.SetCursorPosX(width - 520); - if (Menu.activeButton("\ue0c2 Contracts", bridgeEngine.windowStatuses[Window.Contracts], StyleSets.selected)) + if (Menu.activeButton("\ue0c2 Contracts", bridgeEngine.windowStatuses[Window.Contracts], StyleSets.selected, StyleSets.white)) { 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: - if (Menu.activeButton("$ Budget", showBudget, StyleSets.selected)) + if (Menu.activeButton("$ Budget", showBudget, StyleSets.selected, StyleSets.white)) { bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Budget}); } - if (Menu.activeButton("\ue124 Forest", bridgeEngine.windowStatuses[Window.Forest], StyleSets.selected)) + if (Menu.activeButton("\ue124 Forest", bridgeEngine.windowStatuses[Window.Forest], StyleSets.selected, StyleSets.white)) { bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Forest}); } - if (Menu.activeButton("\ue0bf News", bridgeEngine.windowStatuses[Window.News], StyleSets.selected)) + if (Menu.activeButton("\ue0bf News", bridgeEngine.windowStatuses[Window.News], StyleSets.selected, StyleSets.white)) { bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.News}); } ImGui.Text("|"); - if (Menu.activeButton("\ue0ac Pause", paused, StyleSets.selected )) + if (Menu.activeButton("\ue0ac Pause", paused, StyleSets.selected, StyleSets.white )) { paused = !paused; } - if (Menu.activeButton("1", (rate == 0), StyleSets.selected)) + if (Menu.activeButton("1", (rate == 0), StyleSets.selected, StyleSets.white)) { paused = false; rate = 0; } - else if (Menu.activeButton("2", (rate == 1), StyleSets.selected)) + else if (Menu.activeButton("2", (rate == 1), StyleSets.selected, StyleSets.white)) { paused = false; rate = 1; } - else if (Menu.activeButton("3", (rate == 2), StyleSets.selected)) + else if (Menu.activeButton("3", (rate == 2), StyleSets.selected, StyleSets.white)) { paused = false; rate = 2; } - else if (Menu.activeButton("4", (rate == 3), StyleSets.selected)) + else if (Menu.activeButton("4", (rate == 3), StyleSets.selected, StyleSets.white)) { paused = false; rate = 3; } #if DEBUG - else if (Menu.activeButton("5", (rate == 4), StyleSets.selected)) + else if (Menu.activeButton("5", (rate == 4), StyleSets.selected, StyleSets.white)) { paused = false; rate = 4;