Add support for adding/removing animations

libmsstyle/Animation.cs

@@ -13,9 +13,8 @@ public class Animation
         public int SizeInBytes;
         public int PropertiesIndex;
         public int TransformsIndex;
-
         public AnimationFlags AnimationFlags { get; set; }
-        public int TransformCount { get; set; }
+        private int TransformCount;
         public int StaggerDelay { get; set; }
         public int StaggerDelayCap { get; set; }
         public float StaggerDelayFactor { get; set; }
@@ -24,9 +23,9 @@ public class Animation
         public int TuningLevel { get; set; }
         public float Perspective { get; set; }
         private List<Transform> _transforms = new List<Transform>();
+        [Description("The list of animations to play at the same time.")]
         public List<Transform> Transforms { get { return _transforms; } }
         public PropertyHeader Header;
-
         public Animation(byte[] data, ref int start, PropertyHeader header)
         {
             this.Header = header;
@@ -61,13 +60,14 @@ public Animation(byte[] data, ref int start, PropertyHeader header)
         /// <param name="animationsHeader">Header of the animations class</param>
         /// <param name="part">Animation part</param>
         /// <param name="state">Animation state</param>
-        public Animation(PropertyHeader animationsHeader, int part, int state)
+        public Animation(PropertyHeader header, int part, int state)
         {
             PropertiesIndex = 16;
             TransformsIndex = 56;
-            Header = new PropertyHeader(20000, animationsHeader.typeID);
+            Header = header;
             Header.stateID = state;
             Header.partID = part;
+            CalculateTotalSize();
         }
 
         int GetPaddingForSize(int size)
@@ -77,17 +77,20 @@ int GetPaddingForSize(int size)
             return ((size + 39) & -8) - sizeOfRecordHeader - size;
         }
 
-        public void Write(BinaryWriter bw)
+        private void CalculateTotalSize()
         {
             // Update the total size
             int total_size = 56;
             foreach (var item in Transforms)
             {
                 total_size += item.StructureSize + GetPaddingForSize(item.StructureSize);
             }
-
             Header.sizeInBytes = total_size;
+        }
 
+        public void Write(BinaryWriter bw)
+        {
+            CalculateTotalSize();
             bw.Write(Header.Serialize());
             WriteData(bw);
         }
@@ -143,4 +146,4 @@ public AnimationStates(string name, Dictionary<int, string> states)
             AnimationStateDict = states;
         }
     }
-}
+}

libmsstyle/StyleProperty.cs

@@ -129,8 +129,11 @@ public bool IsValid()
 				classID > 500) // guessing here to be stateless
 				return false;
 
-			// Basic range check
-			if (typeID < (int)IDENTIFIER.ENUM || typeID >= (int)IDENTIFIER.COLORSCHEMES)
+            if (nameID == 20000) //Animation
+                return true;
+
+            // Basic range check
+            if (typeID < (int)IDENTIFIER.ENUM || typeID >= (int)IDENTIFIER.COLORSCHEMES)
 				return false;
 
 			// Some color and font props use an type id as name id.

libmsstyle/TimingFunction.cs

@@ -17,7 +17,6 @@ public class TimingFunction
         public CubicBezierTimingFunction CubicBezier { get; set; }
 
         public PropertyHeader Header;
-
         public TimingFunction(byte[] data, int start, PropertyHeader header)
         {
             this.Header = header;
@@ -33,7 +32,12 @@ public TimingFunction(byte[] data, int start, PropertyHeader header)
                 throw new Exception("Unknown timing function type: " + Type);
             }
         }
-
+        public TimingFunction(PropertyHeader header, int partid)
+        {
+            CubicBezier = new CubicBezierTimingFunction();
+            Header = header;
+            Header.partID = partid;
+        }
         public void Write(BinaryWriter bw)
         {
             if (Type == TimingFunctionType.Undefined)
@@ -44,7 +48,6 @@ public void Write(BinaryWriter bw)
             bw.Write(Header.Serialize());
             WriteData(bw);
         }
-
         public void WriteData(BinaryWriter w)
         {
             w.Write((int)Type);
@@ -54,7 +57,6 @@ public void WriteData(BinaryWriter w)
             }
             w.Write(0); //Write padding
         }
-
         public override string ToString()
         {
             return "Timing function";

libmsstyle/Transform.cs

@@ -17,7 +17,7 @@ public class Transform
         public int DurationTime { get; set; }
         public TransformFlag Flags { get; set; }
         [TypeConverter(typeof(ExpandableObjectConverter))]
-
+        [Description("3D animation. No longer working in Windows 10+")]
         public Transform3D Transform3DStructure { get; set; }
         [TypeConverter(typeof(ExpandableObjectConverter))]
 
@@ -58,7 +58,6 @@ public Transform()
             Transform2DStructure = new Transform2D();
             TransformOpacity = new TransformOpacity();
         }
-
         public Transform(byte[] data, ref int start)
         {
             Type = (TransformType)BitConverter.ToInt32(data, start + 0);

libmsstyle/VisualStyle.cs

@@ -315,7 +315,7 @@ private bool SaveAMap(IntPtr moduleHandle, IntPtr updateHandle)
 
             MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
-
+            m_timingFunctions.OrderBy(t => t.Header.partID);
             foreach (var item in m_timingFunctions)
             {
                 item.Write(bw);

msstyleEditorSharp/Dialogs/ClassView.cs

@@ -118,7 +118,14 @@ public void SetVisualStyle(VisualStyle style)
             }
             classView.EndUpdate();
         }
+        public void Refresh()
+        {
+            classView.BeginUpdate();
+            classView.Nodes.Clear();
+            classView.EndUpdate();
 
+            SetVisualStyle(m_style);
+        }
         bool m_endReached = false;
         public TreeNode FindNextNode(bool includeSelectedNode, Predicate<TreeNode> predicate)
         {

msstyleEditorSharp/Dialogs/MainWindow.cs

@@ -470,15 +470,15 @@ private void OnTreeItemSelected(object sender, TreeViewEventArgs e)
             if (func != null)
             {
                 m_selectedTimingFunction = func;
-                m_propertyView.SetTimingFunction(func);
+                m_propertyView.SetTimingFunction(m_style, func);
                 return;
             }
 
             AnimationTypeDescriptor animation = e.Node.Tag as AnimationTypeDescriptor;
             if (animation != null)
             {
                 m_selectedAnimation = animation;
-                m_propertyView.SetAnimation(animation);
+                m_propertyView.SetAnimation(m_style, animation);
                 return;
             }
 
@@ -748,12 +748,29 @@ private void OnPropertyAdd(object sender, EventArgs e)
             m_propertyView.ShowPropertyAddDialog();
         }
 
-        private void OnPropertyAdded(StyleProperty prop)
+        private void OnPropertyAdded(object prop)
         {
-            // refresh gui to account for new image property
-            if (prop.IsImageProperty())
+            if (prop is StyleProperty styleProp)
             {
-                DisplayPart(m_selection.Class, m_selection.Part);
+                // refresh gui to account for new image property
+                if (styleProp.IsImageProperty())
+                {
+                    DisplayPart(m_selection.Class, m_selection.Part);
+                }
+            }
+
+            if (prop is Animation animation)
+            {
+                m_selectedAnimation = new AnimationTypeDescriptor(animation);
+                m_classView.Refresh();
+                m_propertyView.SetStylePart(null, null, null);
+            }
+
+            if (prop is TimingFunction timingFunc)
+            {
+                m_selectedTimingFunction = timingFunc;
+                m_classView.Refresh();
+                m_propertyView.SetStylePart(null, null, null);
             }
         }
 
@@ -762,12 +779,20 @@ private void OnPropertyRemove(object sender, EventArgs e)
             m_propertyView.RemoveSelectedProperty();
         }
 
-        private void OnPropertyRemoved(StyleProperty prop)
+        private void OnPropertyRemoved(object prop)
         {
-            // refresh gui to account for removed image property
-            if (prop.IsImageProperty())
+            if(prop is StyleProperty styleProp)
+            {
+                // refresh gui to account for removed image property
+                if (styleProp.IsImageProperty())
+                {
+                    DisplayPart(m_selection.Class, m_selection.Part);
+                }
+            }
+            else if (prop is Animation || prop is TimingFunction)
             {
-                DisplayPart(m_selection.Class, m_selection.Part);
+                m_classView.Refresh();
+                m_propertyView.SetStylePart(null, null, null);
             }
         }