diff --git a/isometric-park-fna/UI/InGameMenu.cs b/isometric-park-fna/UI/InGameMenu.cs --- a/isometric-park-fna/UI/InGameMenu.cs +++ b/isometric-park-fna/UI/InGameMenu.cs @@ -20,16 +20,22 @@ ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; bool newShow = true; - Num.Vector2 button_size = new Num.Vector2(120, 20); + + //Has to go first so the measurement is correct: + ImGui.PushFont(font); + + 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.SetNextWindowPos(new Num.Vector2(width/2, 200)); - ImGui.PushFont(font); + // ImGui.PushFont(smallFont); - ImGui.Begin("##In-game Toolbar", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar); + ImGui.Begin("##In-game Toolbar", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.AlwaysAutoResize); if (ImGui.Button("Options", 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 @@ -45,11 +45,12 @@ ImGui.PushFont(font); // ImGui.PushFont(smallFont); // + // ImGui.SetNextWindowSize(new Num.Vector2(320, 320)); if(ForestWindow.hadFocus) { ImGui.PushStyleColor(ImGuiCol.Text, StyleSet.white); } - ImGui.Begin("Options", ref newShow, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings); + ImGui.Begin("Options", ref newShow, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse); if (ForestWindow.hadFocus) { @@ -104,7 +105,7 @@ if (ImGui.BeginCombo("##FontSize", fontSize.ToString())) { - foreach(var size in new[]{9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}) + foreach(var size in new[]{9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25}) { if(ImGui.Selectable(size.ToString())) {