Retain menu selections after exiting edit mode

Author: Perdition-117

DressCode.cs

@@ -528,18 +528,21 @@ private static void DailyCtrl_OnInit(DailyCtrl __instance) {
 	private static void BasePanelMgr_BeforeFadeIn(BasePanelMgr __instance) {
 		if (__instance is DailyMgr dailyMgr && ReopenPanel) {
 			ReopenPanel = false;
-			Open(dailyMgr);
+			Open(dailyMgr, true);
 		}
 	}
 
-	private static void Open(DailyMgr dailyMgr) {
+	private static void Open(DailyMgr dailyMgr, bool retainSelections = false) {
 		var maid = PrivateModeMgr.Instance.PrivateMaid;
 		if (maid != null) {
 			maid.Visible = false;
 		}
 		dailyMgr.m_ctrl.m_goPanel.gameObject.SetActive(false);
 		var manager = dailyMgr.GetManager<DressCodeManager>();
 		manager.SetBackground();
+		if (!retainSelections) {
+			manager.ResetSelections();
+		}
 		manager.OpenPanel();
 	}
 }

DressCodeControl.cs

@@ -10,6 +10,8 @@ internal class DressCodeControl : MonoBehaviour {
 	private static readonly Vector2 ScopeListSize = new(144, 925);
 	private static readonly Vector2 MaidListSize = new(502, 925);
 
+	private static SelectionState _selectionState;
+
 	private SceneList _sceneList;
 	private ScopeList _scopeList;
 	private MaidSelectPanel _maidSelectPanel;
@@ -18,7 +20,6 @@ internal class DressCodeControl : MonoBehaviour {
 	private DressCodeManager m_mgr;
 	private GameObject m_goPanel;
 
-
 	public CostumeScene SelectedScene {
 		get => _sceneList.SelectedValue;
 		set => _sceneList.SelectValue(value);
@@ -86,10 +87,20 @@ public void Init(DressCodeManager manager, CanvasComponent panel) {
 	}
 
 	public void CreateSelector() {
-		SelectedScope = ProfileScope.Scene;
+		var previousSelection = _selectionState;
 		_maidSelectPanel.Initialize();
+		if (previousSelection != null) {
+			SelectedScene = previousSelection.Scene;
+			SelectedScope = previousSelection.Scope;
+			SelectedMaid = previousSelection.Maid;
+		} else {
+			SelectedScope = ProfileScope.Scene;
+			_sceneList.SelectFirstAvailable();
+		}
 	}
 
+	internal void ResetSelections() => _selectionState = null;
+
 	private void SetSceneMode() {
 		_maidSelectPanel.SetActive(false);
 		_profilePanel.SetSceneMode();
@@ -114,11 +125,16 @@ private void UpdateScopeSelection() {
 
 	private void UpdateMaidSelection() {
 		_sceneList.SetNpcMode(SelectedScope == ProfileScope.Maid && SelectedMaid.status.heroineType is not (MaidStatus.HeroineType.Original or MaidStatus.HeroineType.Transfer));
-		_sceneList.SelectFirstAvailable();
+		_sceneList.SelectFirstAvailable(SelectedScene);
 		UpdateProfileSelection();
 	}
 
 	private void UpdateProfileSelection() {
+		_selectionState = new() {
+			Scene = SelectedScene,
+			Scope = SelectedScope,
+			Maid = SelectedMaid,
+		};
 		var profile = SelectedScope switch {
 			ProfileScope.Scene => DressCode.GetPreferredProfile(SelectedScene),
 			ProfileScope.Maid => DressCode.GetPreferredProfile(SelectedMaid, SelectedScene),
@@ -148,4 +164,10 @@ private void OnProfileChanged(object sender, ProfilePanel.ProfileSelectedEventAr
 			}
 		}
 	}
+
+	class SelectionState {
+		public CostumeScene Scene { get; set; }
+		public ProfileScope Scope { get; set; }
+		public Maid Maid { get; set; }
+	}
 }

DressCodeManager.cs

@@ -1,4 +1,4 @@
-using com.workman.cm3d2.scene.dailyEtc;
+using com.workman.cm3d2.scene.dailyEtc;
 using PrivateMaidMode;
 
 namespace COM3D2.DressCode;
@@ -28,6 +28,8 @@ public override void OpenPanel() {
 		m_Ctrl.CreateSelector();
 	}
 
+	internal void ResetSelections() => m_Ctrl.ResetSelections();
+
 	internal void SetBackground() {
 		GameMain.Instance.MainCamera.Reset(CameraMain.CameraType.Target, true);
 		GameMain.Instance.MainCamera.SetTargetPos(new(-0.05539433f, 0.95894f, 0.1269088f));

Panels/SceneList.cs

@@ -24,7 +24,11 @@ public SceneList(BaseComponent parent) : base(parent, nameof(SceneList)) {
 		UpdateChildren();
 	}
 
-	public void SelectFirstAvailable() {
+	public void SelectFirstAvailable(CostumeScene preferredScene = CostumeScene.None) {
+		if (preferredScene != CostumeScene.None && Buttons.First(e => e.Value == preferredScene).IsEnabled) {
+			SelectValue(preferredScene);
+			return;
+		}
 		var button = Buttons.First(e => e.IsEnabled);
 		SelectValue(button.Value);
 	}