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 @@ -17,12 +17,13 @@ if (active) { ImGui.PushStyleColor(ImGuiCol.Button, activeColor); + ImGui.PushStyleColor(ImGuiCol.ButtonHovered, activeColor); } var result = ImGui.Button(label); if (active) { - ImGui.PopStyleColor(); + ImGui.PopStyleColor(2); } return result; @@ -32,24 +33,11 @@ ImGui.PushFont(font); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; - ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0.0f); - ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0.0f); - ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.0f); - ImGui.PushStyleColor(ImGuiCol.WindowBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); - ImGui.PushStyleColor(ImGuiCol.MenuBarBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); - ImGui.PushStyleColor(ImGuiCol.PopupBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); - - ImGui.PushStyleColor(ImGuiCol.TitleBg, StyleSet.title_bar); - ImGui.PushStyleColor(ImGuiCol.TitleBgActive, StyleSet.title_bar); - ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, StyleSet.title_bar); - - ImGui.PushStyleColor(ImGuiCol.Border, new Num.Vector4(0f, 0f, 0f, 1f)); - ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Num.Vector4(0f, 0f, 0f, 0.5f)); - - ImGui.PushStyleColor(ImGuiCol.Button, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); - ImGui.PushStyleColor(ImGuiCol.Text, new Num.Vector4(0f, 0f, 0f, 1f)); + StyleSet.pushStyleVarSet(StyleSet.defaultWindowVars); + StyleSet.pushColorSet(StyleSet.defaultWindowColors); + ImGui.PushStyleColor(ImGuiCol.MenuBarBg, StyleSet.grey); if (ImGui.BeginMainMenuBar()) { @@ -119,8 +107,10 @@ // ImGui.End(); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; - ImGui.PopStyleVar(3); - ImGui.PopStyleColor(9); + + StyleSet.popStyleVarSet(StyleSet.defaultWindowVars); + StyleSet.popColorSet(StyleSet.defaultWindowColors); + ImGui.PopStyleColor(1); ImGui.PopFont(); } }