Remove MainMenuDarkeningPanel

CnCNet · Feb 21, 2024 · e71a36e · e71a36e
1 parent b96ef8e
commit e71a36e
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 214 deletions.
diff --git a/DXMainClient/DXGUI/GameClass.cs b/DXMainClient/DXGUI/GameClass.cs
@@ -230,7 +230,14 @@ private IServiceProvider BuildServiceProvider(WindowManager windowManager)
  .AddSingletonXnaControl<MainMenu>()
  .AddSingletonXnaControl<MapPreviewBox>()
  .AddSingletonXnaControl<GameLaunchButton>()
- .AddSingletonXnaControl<PlayerExtraOptionsPanel>();
+ .AddSingletonXnaControl<PlayerExtraOptionsPanel>()
+ .AddSingletonXnaControl<CampaignSelector>()
+ .AddSingletonXnaControl<GameLoadingWindow>()
+ .AddSingletonXnaControl<StatisticsWindow>()
+ .AddSingletonXnaControl<UpdateQueryWindow>()
+ .AddSingletonXnaControl<ManualUpdateQueryWindow>()
+ .AddSingletonXnaControl<UpdateWindow>()
+ .AddSingletonXnaControl<ExtrasWindow>();
 
  // transient xna controls - new instance on each request
  services

diff --git a/DXMainClient/DXGUI/Generic/CampaignSelector.cs b/DXMainClient/DXGUI/Generic/CampaignSelector.cs
@@ -221,7 +221,7 @@ private void LbCampaignList_SelectedIndexChanged(object sender, EventArgs e)
 
  private void BtnCancel_LeftClick(object sender, EventArgs e)
  {
- Enabled = false;
+ Disable();
  }
 
  private void BtnLaunch_LeftClick(object sender, EventArgs e)
@@ -317,7 +317,7 @@ private void LaunchMission(Mission mission)
  UserINISettings.Instance.Difficulty.Value = trbDifficultySelector.Value;
  UserINISettings.Instance.SaveSettings();
 
- ((MainMenuDarkeningPanel)Parent).Hide();
+ Disable();
 
  discordHandler.UpdatePresence(mission.UntranslatedGUIName, difficultyName, mission.IconPath, true);
  GameProcessLogic.GameProcessExited += GameProcessExited_Callback;

diff --git a/DXMainClient/DXGUI/Generic/ExtrasWindow.cs b/DXMainClient/DXGUI/Generic/ExtrasWindow.cs
@@ -12,9 +12,11 @@ namespace DTAClient.DXGUI.Generic
 {
  public class ExtrasWindow : XNAWindow
  {
- public ExtrasWindow(WindowManager windowManager) : base(windowManager)
- {
+ private StatisticsWindow statisticsWindow;
 
+ public ExtrasWindow(WindowManager windowManager, StatisticsWindow statisticsWindow) : base(windowManager)
+ {
+ this.statisticsWindow = statisticsWindow;
  }
 
  public override void Initialize()
@@ -59,8 +61,8 @@ public override void Initialize()
 
  private void BtnExStatistics_LeftClick(object sender, EventArgs e)
  {
- MainMenuDarkeningPanel parent = (MainMenuDarkeningPanel)Parent;
- parent.Show(parent.StatisticsWindow);
+ Disable();
+ statisticsWindow.Enable();
  }
 
  private void BtnExMapEditor_LeftClick(object sender, EventArgs e)
@@ -75,7 +77,7 @@ private void BtnExMapEditor_LeftClick(object sender, EventArgs e)
 
  mapEditorProcess.Start();
 
- Enabled = false;
+ Disable();
  }
 
  private void BtnExCredits_LeftClick(object sender, EventArgs e)
@@ -85,7 +87,7 @@ private void BtnExCredits_LeftClick(object sender, EventArgs e)
 
  private void BtnExCancel_LeftClick(object sender, EventArgs e)
  {
- Enabled = false;
+ Disable();
  }
  }
 }
diff --git a/DXMainClient/DXGUI/Generic/GameLoadingWindow.cs b/DXMainClient/DXGUI/Generic/GameLoadingWindow.cs
@@ -98,7 +98,7 @@ private void ListBox_SelectedIndexChanged(object sender, EventArgs e)
 
  private void BtnCancel_LeftClick(object sender, EventArgs e)
  {
- Enabled = false;
+ Disable();
  }
 
  private void BtnLaunch_LeftClick(object sender, EventArgs e)
@@ -136,7 +136,7 @@ private void BtnLaunch_LeftClick(object sender, EventArgs e)
 
  discordHandler.UpdatePresence(sg.GUIName, true);
 
- Enabled = false;
+ Disable();
  GameProcessLogic.GameProcessExited += GameProcessExited_Callback;
 
  GameProcessLogic.StartGameProcess(WindowManager);