2 Minor bug fix & enhancement

- Fix non-intractable playlist view when queue list is disabled - Add additional checks on frontend handler inspector to prevent select invalid default playlist/queue lists when some options combined
JLChnToZ · Mar 16, 2024 · 04b368b · 04b368b
1 parent 6df9f0c
commit 04b368b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/Packages/idv.jlchntoz.vvmw/Editor/VVMW/FrontendHandlerEditor.cs b/Packages/idv.jlchntoz.vvmw/Editor/VVMW/FrontendHandlerEditor.cs
@@ -58,18 +58,36 @@ public override void OnInspectorGUI() {
                 coreSerializedObject?.Dispose();
                 coreSerializedObject = coreProperty.objectReferenceValue != null ? new SerializedObject(coreProperty.objectReferenceValue) : null;
             }
-            EditorGUILayout.PropertyField(enableQueueListProperty);
-            if (playListNames == null || playListNames.Length != playListTitlesProperty.arraySize + 1)
+            using (var changed = new EditorGUI.ChangeCheckScope()) {
+                EditorGUILayout.PropertyField(enableQueueListProperty);
+                if (changed.changed &&
+                    !enableQueueListProperty.boolValue &&
+                    defaultPlayListIndexProperty.intValue == 0 &&
+                    playListTitlesProperty.arraySize > 0)
+                    defaultPlayListIndexProperty.intValue = 1;
+            }
+            if (playListNames == null || playListNames.Length != playListTitlesProperty.arraySize + (enableQueueListProperty.boolValue ? 1 : 0))
                 UpdatePlayListNames();
             if (GUILayout.Button("Edit Playlists..."))
                 PlayListEditorWindow.StartEditPlayList(target as FrontendHandler);
             var rect = GUILayoutUtility.GetRect(0, EditorGUIUtility.singleLineHeight);
             var tempContent = Utils.GetTempContent("Default Playlist");
-            using (new EditorGUI.PropertyScope(rect, tempContent, playListTitlesProperty))
+            using (new EditorGUI.DisabledScope(playListNames.Length == 0))
+            using (new EditorGUI.PropertyScope(rect, tempContent, defaultPlayListIndexProperty))
             using (var changed = new EditorGUI.ChangeCheckScope()) {
                 rect = EditorGUI.PrefixLabel(rect, tempContent);
-                var index = EditorGUI.Popup(rect, defaultPlayListIndexProperty.intValue, playListNames);
-                if (changed.changed) defaultPlayListIndexProperty.intValue = index;
+                var index = defaultPlayListIndexProperty.intValue;
+                bool forceUpdate = false;
+                if (!enableQueueListProperty.boolValue) index--;
+                if (index < 0 || index >= playListNames.Length) {
+                    index = 0;
+                    forceUpdate = true;
+                }
+                index = EditorGUI.Popup(rect, index, playListNames);
+                if (forceUpdate || changed.changed) {
+                    if (!enableQueueListProperty.boolValue) index++;
+                    defaultPlayListIndexProperty.intValue = index;
+                }
             }
             if (coreSerializedObject != null && defaultPlayListIndexProperty.intValue > 0) {
                 var url = coreSerializedObject.FindProperty("defaultUrl.url");
@@ -128,11 +146,13 @@ void OnFrontEndUpdated(FrontendHandler handler) {
         }
 
         void UpdatePlayListNames() {
-            if (playListNames == null || playListNames.Length != playListTitlesProperty.arraySize + 1)
-                playListNames = new string[playListTitlesProperty.arraySize + 1];
-            playListNames[0] = "<Queue List>";
-            for (int i = 0; i < playListNames.Length - 1; i++)
-                playListNames[i + 1] = playListTitlesProperty.GetArrayElementAtIndex(i).stringValue;
+            int queueListOffset = enableQueueListProperty.boolValue ? 1 : 0;
+            int requiredSize = playListTitlesProperty.arraySize + queueListOffset;
+            if (playListNames == null || playListNames.Length != requiredSize)
+                playListNames = new string[requiredSize];
+            if (queueListOffset > 0) playListNames[0] = "<Queue List>";
+            for (int i = queueListOffset; i < requiredSize; i++)
+                playListNames[i] = playListTitlesProperty.GetArrayElementAtIndex(i - queueListOffset).stringValue;
         }
 
         struct PlayList {

diff --git a/Packages/idv.jlchntoz.vvmw/Runtime/VVMW/FrontendHandler.cs b/Packages/idv.jlchntoz.vvmw/Runtime/VVMW/FrontendHandler.cs
@@ -84,7 +84,13 @@ private set {
 
         public bool HasQueueList => enableQueueList;
 
-        public int PlayListIndex => localPlayListIndex;
+        public int PlayListIndex {
+            get {
+                if (localPlayingIndex > 0) return localPlayingIndex;
+                if (!enableQueueList) return defaultPlayListIndex;
+                return 0;
+            }
+        }
 
         public string[] PlayListTitles => playListTitles;