diff --git a/isometric-park-fna/UI/ContractsWindow.cs b/isometric-park-fna/UI/ContractsWindow.cs --- a/isometric-park-fna/UI/ContractsWindow.cs +++ b/isometric-park-fna/UI/ContractsWindow.cs @@ -25,11 +25,6 @@ { bool newShow = true; - // Entity newSelected; - var grey = new Num.Vector4(0.75f, 0.75f, 0.75f, 1f); - var darkgrey = new Num.Vector4(0.45f, 0.45f, 0.45f, 1f); - var black = new Num.Vector4(0f, 0f, 0f, 1f); - var title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f); if (newShow) { @@ -41,7 +36,7 @@ ImGui.SetNextWindowSize(new Num.Vector2(320, 340)); ImGui.Begin("Contracts", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings); - ImGui.ListBoxHeader("##Contracts:", new Num.Vector2(300, 150)); + ImGui.ListBoxHeader("##Contracts:", new Num.Vector2(320, 150)); foreach (var contract in contracts.Where((contract) => ((!(new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected}.Contains(contract.status)) || ContractsWindow.show_all )))) { 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 @@ -39,10 +39,9 @@ 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); + 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)); diff --git a/isometric-park-fna/UI/NewsWindow.cs b/isometric-park-fna/UI/NewsWindow.cs --- a/isometric-park-fna/UI/NewsWindow.cs +++ b/isometric-park-fna/UI/NewsWindow.cs @@ -81,10 +81,9 @@ ImGui.PushStyleColor(ImGuiCol.HeaderActive, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); ImGui.PushStyleColor(ImGuiCol.ButtonHovered, 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); + 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)); diff --git a/isometric-park-fna/UI/StyleSet.cs b/isometric-park-fna/UI/StyleSet.cs --- a/isometric-park-fna/UI/StyleSet.cs +++ b/isometric-park-fna/UI/StyleSet.cs @@ -8,10 +8,10 @@ { public class StyleSet { - static Num.Vector4 grey = new Num.Vector4(0.75f, 0.75f, 0.75f, 1f); - static Num.Vector4 darkgrey = new Num.Vector4(0.45f, 0.45f, 0.45f, 1f); - static Num.Vector4 black = new Num.Vector4(0f, 0f, 0f, 1f); - static Num.Vector4 title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f); + public static Num.Vector4 grey = new Num.Vector4(0.75f, 0.75f, 0.75f, 1f); + public static Num.Vector4 darkgrey = new Num.Vector4(0.45f, 0.45f, 0.45f, 1f); + public static Num.Vector4 black = new Num.Vector4(0f, 0f, 0f, 1f); + public static Num.Vector4 title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f); public static Dictionary defaultWindowVars = new Dictionary{ { ImGuiStyleVar.FrameRounding, 0.0f }, {ImGuiStyleVar.WindowRounding, 0.0f},