More work on animation editor

vchelaru · Feb 3, 2024 · afa472f · afa472f
1 parent 4f2520c
commit afa472f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/FRBDK/Glue/OfficialPlugins/AnimationChainPlugin/Managers/AchxManager.cs b/FRBDK/Glue/OfficialPlugins/AnimationChainPlugin/Managers/AchxManager.cs
@@ -53,17 +53,26 @@ private static void HandleViewModelPropertyChanged(object sender, PropertyChange
             {
                 case nameof(ViewModel.SelectedAnimationChain):
                 case nameof(ViewModel.SelectedAnimationFrame):
-                    if(ViewModel.SelectedAnimationFrame != null)
+                case nameof(ViewModel.SelectedShape):
+                    if(ViewModel.SelectedShape != null)
                     {
-                        View.PropertyGrid.Visibility = System.Windows.Visibility.Visible;
-                        PropertyGridManager.ShowInPropertyGrid(ViewModel.SelectedAnimationFrame);
+                        if(ViewModel.SelectedShape is CircleViewModel circle)
+                        {
+                            View.PropertyGrid.Visibility = System.Windows.Visibility.Visible;
+                            PropertyGridManager.ShowInPropertyGrid(circle);
+                        }
+                        else
+                        {
+                            View.PropertyGrid.Visibility = System.Windows.Visibility.Hidden;
+
+                        }
                     }
-                    else if(ViewModel.SelectedShape != null)
+                    else if(ViewModel.SelectedAnimationFrame != null)
                     {
-                        //Show Shape Properties
-                        View.PropertyGrid.Visibility = System.Windows.Visibility.Hidden;
+                        View.PropertyGrid.Visibility = System.Windows.Visibility.Visible;
+                        PropertyGridManager.ShowInPropertyGrid(ViewModel.SelectedAnimationFrame);
                     }
-                    else
+                    else if(ViewModel.SelectedAnimationChain != null)
                     {
                         View.PropertyGrid.Visibility = System.Windows.Visibility.Visible;
                         PropertyGridManager.ShowInPropertyGrid(ViewModel.SelectedAnimationChain);

diff --git a/FRBDK/Glue/OfficialPlugins/AnimationChainPlugin/Managers/MemberCategoryManager.cs b/FRBDK/Glue/OfficialPlugins/AnimationChainPlugin/Managers/MemberCategoryManager.cs
@@ -94,7 +94,7 @@ void Add(string propertyName, bool canWrite = false)
 
         #region Circle
 
-        private static void SetmemberCategories(DataUiGrid grid, CircleViewModel circle)
+        public static void SetMemberCategories(DataUiGrid grid, CircleViewModel circle)
         {
             var list = new List<MemberCategory>();
 

diff --git a/FRBDK/Glue/OfficialPlugins/AnimationChainPlugin/Managers/PropertyGridManager.cs b/FRBDK/Glue/OfficialPlugins/AnimationChainPlugin/Managers/PropertyGridManager.cs
@@ -31,5 +31,12 @@ internal static void ShowInPropertyGrid(AnimationFrameViewModel selectedAnimatio
             PropertyGrid.Refresh();
         }
 
+        internal static void ShowInPropertyGrid(CircleViewModel circle)
+        {
+            PropertyGrid.Instance = circle;
+            MemberCategoryManager.SetMemberCategories(PropertyGrid, circle);
+            PropertyGrid.Refresh();
+        }
+
     }
 }