[CMW] Do not close ConfigurationManager window if it was moved inside…

… the settings screen
IllusionMods · Dec 30, 2023 · f29855a · f29855a
1 parent b6af626
commit f29855a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/AI_ConfigurationManager/AI.ConfigurationManager.cs b/src/AI_ConfigurationManager/AI.ConfigurationManager.cs
@@ -72,6 +72,6 @@ private static void OnOpen(ConfigWindow __instance, ref Button[] ___buttons)
  }
 
  [HarmonyPostfix, HarmonyPatch(typeof(ConfigWindow), nameof(ConfigWindow.Unload))]
- private static void OnClose() => _manager.DisplayingWindow = false;
+ private static void OnClose() => _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
 }
diff --git a/src/EC_ConfigurationManager/EC.ConfigurationManager.cs b/src/EC_ConfigurationManager/EC.ConfigurationManager.cs
@@ -64,6 +64,6 @@ IEnumerator CreateButton()
  }
 
  [HarmonyPostfix, HarmonyPatch(typeof(ConfigScene), nameof(ConfigScene.Unload))]
- private static void OnClose() => _manager.DisplayingWindow = false;
+ private static void OnClose() => _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
 }
diff --git a/src/HC_ConfigurationManager/HC.ConfigurationManager.cs b/src/HC_ConfigurationManager/HC.ConfigurationManager.cs
@@ -121,6 +121,6 @@ private static void OnOpen(ConfigWindow __instance)
  }
 
  [HarmonyPostfix, HarmonyPatch(typeof(ConfigWindow), nameof(ConfigWindow.Unload))]
- private static void OnClose() => _manager.DisplayingWindow = false;
+ private static void OnClose() => _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
 }
diff --git a/src/HS2_ConfigurationManager/HS2.ConfigurationManager.cs b/src/HS2_ConfigurationManager/HS2.ConfigurationManager.cs
@@ -69,6 +69,6 @@ private static void OnOpen(ConfigWindow __instance, ref Button[] ___buttons)
  }
 
  [HarmonyPostfix, HarmonyPatch(typeof(ConfigWindow), nameof(ConfigWindow.Unload))]
- private static void OnClose() => _manager.DisplayingWindow = false;
+ private static void OnClose() => _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
 }
diff --git a/src/HS_ConfigurationManager/HS.ConfigurationManager.cs b/src/HS_ConfigurationManager/HS.ConfigurationManager.cs
@@ -113,7 +113,7 @@ private IEnumerator SceneChanged()
  else
  {
  _previousWindowState = _manager.DisplayingWindow;
- _manager.DisplayingWindow = false;
+ _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
  }
 

diff --git a/src/KKS_ConfigurationManager/KKS_ConfigurationManager.cs b/src/KKS_ConfigurationManager/KKS_ConfigurationManager.cs
@@ -67,6 +67,6 @@ private static void CreateButton()
  private static void OnOpen(ref UniTask __result) => __result.GetAwaiter().OnCompleted(CreateButton);
 
  [HarmonyPostfix, HarmonyPatch(typeof(ConfigScene), nameof(ConfigScene.Unload))]
- private static void OnClose() => _manager.DisplayingWindow = false;
+ private static void OnClose() => _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
 }
diff --git a/src/KK_ConfigurationManager/KK.ConfigurationManager.cs b/src/KK_ConfigurationManager/KK.ConfigurationManager.cs
@@ -75,6 +75,6 @@ IEnumerator CreateButton()
  }
 
  [HarmonyPostfix, HarmonyPatch(typeof(ConfigScene), nameof(ConfigScene.Unload))]
- private static void OnClose() => _manager.DisplayingWindow = false;
+ private static void OnClose() => _manager.DisplayingWindow = _manager.DisplayingWindow && !_manager.IsWindowFullscreen; // Keep the window open if user dragged it
  }
 }