# HG changeset patch # User Alys Brooks # Date 2021-06-26 08:42:11 # Node ID c6e295d52c0fb9177e536fb61fa4e3aa72a4d0ad # Parent bf0e283a135a9cbb3256f837bd285a1018e40452 Improve resizing. 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 @@ -18,15 +18,19 @@ /*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); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; bool newShow = true; - Num.Vector2 button_size = new Num.Vector2(80, 20); + + 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); + StyleSet.pushStyleVarSet(StyleSet.defaultWindowVars); StyleSet.pushColorSet(StyleSet.defaultWindowColors); - ImGui.PushFont(font); - // ImGui.PushFont(smallFont); ImGui.Begin("##Toolbar", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar); if (ImGui.Button("New Game", button_size)) diff --git a/isometric-park-fna/UI/OptionsWindow.cs b/isometric-park-fna/UI/OptionsWindow.cs --- a/isometric-park-fna/UI/OptionsWindow.cs +++ b/isometric-park-fna/UI/OptionsWindow.cs @@ -46,13 +46,13 @@ // ImGui.PushFont(smallFont); // // ImGui.SetNextWindowSize(new Num.Vector2(320, 320)); - if(ForestWindow.hadFocus) + if(OptionsWindow.hadFocus) { ImGui.PushStyleColor(ImGuiCol.Text, StyleSet.white); } ImGui.Begin("Options", ref newShow, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse); - if (ForestWindow.hadFocus) + if (OptionsWindow.hadFocus) { ImGui.PopStyleColor(); }