Removed Id from Window

kaczy93 · Nov 9, 2023 · 4ce7969 · 4ce7969
1 parent 451abd6
commit 4ce7969
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/CentrED/UI/Windows/ConnectWindow.cs b/CentrED/UI/Windows/ConnectWindow.cs
@@ -26,8 +26,8 @@ public class ConnectWindow : Window {
     public override void Draw() {
         if (!Show) return;
 
-        ImGui.Begin(Id, ref _show,  ImGuiWindowFlags.NoResize);
-        ImGui.SetWindowSize(Id, new Vector2(510, 250));
+        ImGui.Begin(Name, ref _show,  ImGuiWindowFlags.NoResize);
+        ImGui.SetWindowSize(Name, new Vector2(510, 250));
         // CenterWindow();
         if (ImGui.Combo("Profile", ref _profileIndex, ProfileManager.ProfileNames,
                 ProfileManager.Profiles.Count)) {

diff --git a/CentrED/UI/Windows/DebugWindow.cs b/CentrED/UI/Windows/DebugWindow.cs
@@ -20,7 +20,7 @@ public override void Draw() {
         //     ImGuiCond.FirstUseEver);
         var uiManager = Application.CEDGame.UIManager;
         var mapManager = Application.CEDGame.MapManager;
-        ImGui.Begin(Id, ref _show, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize);
+        ImGui.Begin(Name, ref _show, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize);
         ImGui.Text($"FPS: {uiManager._framesPerSecond:F1}");
         ImGui.Text($"Resolution: {uiManager._graphicsDevice.PresentationParameters.BackBufferWidth}x{uiManager._graphicsDevice.PresentationParameters.BackBufferHeight}");
         ImGui.Text($"Land tiles: {mapManager.LandTiles.Count}");

diff --git a/CentrED/UI/Windows/InfoWindow.cs b/CentrED/UI/Windows/InfoWindow.cs
@@ -13,7 +13,7 @@ public class InfoWindow : Window{
     public override void Draw() {
         if (!Show) return;
 
-        ImGui.Begin(Id, ref _show);
+        ImGui.Begin(Name, ref _show);
         if (Selected is LandObject lo) {
             var land = lo.Tile;
             ImGui.Text("Land");

diff --git a/CentrED/UI/Windows/ServerWindow.cs b/CentrED/UI/Windows/ServerWindow.cs
@@ -17,7 +17,7 @@ public class ServerWindow : Window {
     public override void Draw() {
         if (!Show) return;
 
-        ImGui.Begin(Id, ref _show );
+        ImGui.Begin(Name, ref _show );
         ImGui.InputText("Config File", ref _configPath, 512);
         ImGui.SameLine();
         if (ImGui.Button("...")) {

diff --git a/CentrED/UI/Windows/TilesWindow.cs b/CentrED/UI/Windows/TilesWindow.cs
@@ -56,7 +56,7 @@ private void FilterTiles() {
     public override void Draw() {
          if (!Show) return;
         ImGui.SetNextWindowSize(new Vector2(250, CEDGame._gdm.GraphicsDevice.PresentationParameters.BackBufferHeight - CEDGame.UIManager._mainMenuHeight), ImGuiCond.FirstUseEver);
-        ImGui.Begin(Id, ref _show);
+        ImGui.Begin(Name, ref _show);
         if (ImGui.Button("Scroll to selected")) {
             _updateScroll = true;
         }

diff --git a/CentrED/UI/Windows/ToolboxWindow.cs b/CentrED/UI/Windows/ToolboxWindow.cs
@@ -9,7 +9,7 @@ public class ToolboxWindow : Window {
     public override void Draw() {
         if (!Show) return;
 
-        ImGui.Begin(Id, ref _show);
+        ImGui.Begin(Name, ref _show);
         CEDGame.UIManager.tools.ForEach(ToolButton);
         ImGui.End();
         CEDGame.MapManager.ActiveTool?.DrawWindow();

diff --git a/CentrED/UI/Windows/Window.cs b/CentrED/UI/Windows/Window.cs
@@ -7,8 +7,6 @@ public abstract string Name {
         get;
     }
 
-    public string Id => Name.Replace(" ", "");
-
     public virtual string Shortcut => "";
 
     protected bool _show;