[HaCreator] automatically navigate to the tileSet upon selecting a ne…

…w layer
lastbattle · Nov 25, 2024 · ca02951 · ca02951
1 parent 5f8ce69
commit ca02951
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/HaCreator/GUI/EditorPanels/TilePanel.cs b/HaCreator/GUI/EditorPanels/TilePanel.cs
@@ -64,6 +64,19 @@ private void tileBrowse_Click(object sender, EventArgs e)
             }
         }
 
+        /// <summary>
+        /// Sets the currently selected tileSet, and refresh the list of tiles
+        /// </summary>
+        /// <param name="tileSet"></param>
+        public void SetSelectedTileSet(string tileSet)
+        {
+            if (!Program.InfoManager.TileSets.ContainsKey(tileSet))
+                return;
+            tileSetList.SelectedItem = tileSet;
+
+            LoadTileSetList();
+        }
+
         private void tileSetList_SelectedIndexChanged(object sender, EventArgs e)
         {
             LoadTileSetList();
@@ -81,6 +94,7 @@ public void LoadTileSetList()
                     return;
                 WzImage tileSetImage = Program.InfoManager.TileSets[selectedSetName];
                 int? mag = InfoTool.GetOptionalInt(tileSetImage["info"]["mag"]);
+
                 foreach (WzSubProperty tCat in tileSetImage.WzProperties)
                 {
                     if (tCat.Name == "info") 

diff --git a/HaCreator/GUI/HaRibbon.xaml.cs b/HaCreator/GUI/HaRibbon.xaml.cs
@@ -409,20 +409,24 @@ private void UpdateLocalLayerInfo()
             actualPlatform = platformBox.SelectedItem == null ? 0 : (int)platformBox.SelectedItem;
         }
 
-        private void UpdateRemoteLayerInfo()
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="tileSet">The tileSet name</param>
+        private void UpdateRemoteLayerInfo(string tileSet)
         {
             if (LayerViewChanged != null)
-                LayerViewChanged.Invoke(actualLayerIndex, actualPlatform, layerCheckbox.IsChecked.Value, (layerCheckbox.IsChecked.Value || platformCheckbox.IsChecked.Value));
+                LayerViewChanged.Invoke(actualLayerIndex, actualPlatform, layerCheckbox.IsChecked.Value, (layerCheckbox.IsChecked.Value || platformCheckbox.IsChecked.Value), tileSet);
         }
 
         private void AllLayerView_Executed(object sender, ExecutedRoutedEventArgs e)
         {
-            UpdateRemoteLayerInfo();
+            UpdateRemoteLayerInfo(null);
         }
 
         private void AllPlatformView_Executed(object sender, ExecutedRoutedEventArgs e)
         {
-            UpdateRemoteLayerInfo();
+            UpdateRemoteLayerInfo(null);
         }
 
         private void LoadPlatformsForLayer(SortedSet<int> zms)
@@ -443,9 +447,13 @@ private void layerBox_SelectionChanged(object sender, SelectionChangedEventArgs
         {
             if (!isInternal)
             {
-                LoadPlatformsForLayer(layers[layerBox.SelectedIndex].zMList);
+                Layer layer = layers[layerBox.SelectedIndex];
+                var zmList = layer.zMList;
+                string tileSet = layer.tS;
+
+                LoadPlatformsForLayer(zmList);
                 UpdateLocalLayerInfo();
-                UpdateRemoteLayerInfo();
+                UpdateRemoteLayerInfo(tileSet);
             }
         }
 
@@ -454,7 +462,7 @@ private void platformBox_SelectionChanged(object sender, SelectionChangedEventAr
             if (!isInternal)
             {
                 UpdateLocalLayerInfo();
-                UpdateRemoteLayerInfo();
+                UpdateRemoteLayerInfo(null);
             }
         }
 
@@ -511,7 +519,7 @@ public void SetLayer(Layer layer)
         public delegate void EmptyEvent();
         public delegate void ViewToggleEvent(bool? tiles, bool? objs, bool? npcs, bool? mobs, bool? reactors, bool? portals, bool? footholds, bool? ropes, bool? chairs, bool? tooltips, bool? backgrounds, bool? misc, bool? mirrorField);
         public delegate void ToggleEvent(bool pressed);
-        public delegate void LayerViewChangedEvent(int layer, int platform, bool allLayers, bool allPlats);
+        public delegate void LayerViewChangedEvent(int layer, int platform, bool allLayers, bool allPlats, string tileSet);
 
         public event EmptyEvent NewClicked;
         public event EmptyEvent OpenClicked;

diff --git a/HaCreator/MapEditor/HaCreatorStateManager.cs b/HaCreator/MapEditor/HaCreatorStateManager.cs
@@ -924,13 +924,18 @@ private void SetLayer(int currentLayer, int currentPlatform, bool allLayers, boo
             ApplicationSettings.lastAllLayers = allLayers;
         }
 
-        void ribbon_LayerViewChanged(int layer, int platform, bool allLayers, bool allPlats)
+        void ribbon_LayerViewChanged(int layer, int platform, bool allLayers, bool allPlats, string tileSet)
         {
             if (multiBoard.SelectedBoard == null)
                 return;
             SetLayer(layer, platform, allLayers, allPlats);
             InputHandler.ClearSelectedItems(multiBoard.SelectedBoard);
 
+            // Update tilePanel to navigate to that selected tileLayer
+            if (tileSet != null)
+            {
+                tilePanel.SetSelectedTileSet(tileSet);
+            }
         }
         #endregion