diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -865,7 +865,7 @@ bool quit = false; Menu.Render(debugWindow.monoFont, FNAGame.width, ref quit, ref this.simulation.paused, ref this.simulation.currentRate, - ref this.showBudget, ref this.showForest); + ref this.showBudget, ref this.showForest, header_left); if (quit) { System.Environment.Exit(0); diff --git a/isometric-park-fna/UI/DebugWindow.cs b/isometric-park-fna/UI/DebugWindow.cs --- a/isometric-park-fna/UI/DebugWindow.cs +++ b/isometric-park-fna/UI/DebugWindow.cs @@ -128,25 +128,6 @@ ImGui.Text(string.Format("Application average {0:F3} ms/frame ({1:F1} FPS", 1000f / ImGui.GetIO().Framerate, ImGui.GetIO().Framerate)); - if (ImGui.BeginMainMenuBar()) - { - if (ImGui.BeginMenu("File")) - { - if (ImGui.MenuItem("New")) - { - //Do something - } - ImGui.EndMenu(); - } - - ImGui.EndMainMenuBar(); - } - if (ImGui.BeginMainMenuBar()) - { - ImGui.EndMainMenuBar(); - } - - if (ImGui.Button("Test Window")) { 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 @@ -15,11 +15,6 @@ } var result = ImGui.Button(label); - // if (ImGui.IsItemHovered()) { - // ImGui.SetTooltip("Test"); - - // ImGui.EndTooltip(); - // } if (active) { ImGui.PopStyleColor(); @@ -27,90 +22,38 @@ return result; } - public static void Render(ImFontPtr font, int width, ref bool quit, ref bool paused, ref int rate, ref bool show_budget, ref bool show_forest) + public static void Render(ImFontPtr font, int width, ref bool quit, ref bool paused, ref int rate, ref bool show_budget, ref bool show_forest, string header) { - ImGui.PushFont(font); + 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.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)); - var title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f); - ImGui.PushStyleColor(ImGuiCol.TitleBg, title_bar); - ImGui.PushStyleColor(ImGuiCol.TitleBgActive, title_bar); - ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, title_bar); + var title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f); + ImGui.PushStyleColor(ImGuiCol.TitleBg, title_bar); + ImGui.PushStyleColor(ImGuiCol.TitleBgActive, title_bar); + ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, 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.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)); - - if (ImGui.BeginMainMenuBar()) { - if (ImGui.BeginMenu("File")) { - - if (ImGui.MenuItem("Exit (Q)")) - { - quit = true; - } - ImGui.EndMenu(); - } - if (ImGui.BeginMenu("Speed")) { - - if (ImGui.MenuItem("Pause", "", paused)) { - paused = !paused; - } - - ImGui.Separator(); + 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)); - if (ImGui.MenuItem("1 - Slow", "1", (rate == 0))) { - paused = false; - rate = 0; - } - else if (ImGui.MenuItem("2 - Normal", "2", (rate == 1))) { - paused = false; - rate = 1; - } - else if (ImGui.MenuItem("3 - Fast", "3", (rate == 2))) { - paused = false; - rate = 2; - } - else if (ImGui.MenuItem("4 - Fastest", "4", (rate == 3))) { - paused = false; - rate = 3; - } - #if DEBUG - else if (ImGui.MenuItem("5 - Warp", "5", (rate == 4))) { - paused = false; - rate = 4; - } - #endif - + if (ImGui.BeginMainMenuBar()) + { - ImGui.EndMenu(); - } - - if (ImGui.BeginMenu("Window")) { - - if (ImGui.MenuItem("(B)udget", "", show_budget)) { - show_budget = !show_budget; + ImGui.Text(header); - } - else if (ImGui.MenuItem("(F)orest Policy", "", show_forest)) { - show_forest = !show_forest; + ImGui.SetCursorPosX(width - 350); - } - ImGui.EndMenu(); - } - ImGui.SetCursorPosX(width - 400); - - Menu.activeButton("Test", true, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)); if (Menu.activeButton("&Budget", show_budget, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) { show_budget = !show_budget; @@ -128,7 +71,7 @@ { paused = !paused; } - if (Menu.activeButton("1", (rate == 0), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) + if (Menu.activeButton("1 ①", (rate == 0), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) { paused = false; rate = 0; @@ -161,12 +104,12 @@ // ImGui.Button("Toolbar goes here", new Num.Vector2(0, 37)); - // ImGui.End(); + // ImGui.End(); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; - ImGui.PopStyleVar(3); - ImGui.PopStyleColor(9); - ImGui.PopFont(); - } - } - } + ImGui.PopStyleVar(3); + ImGui.PopStyleColor(9); + ImGui.PopFont(); + } + } + } } \ No newline at end of file