Merge remote-tracking branch 'upstream/master'

Content.Client/_White/Wizard/Mirror/WizardMirrorWindow.cs

@@ -291,6 +291,15 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
         };
 
         #endregion Eyes
+
+        #region Markings
+
+        CMarkings.OnMarkingAdded += OnMarkingChange;
+        CMarkings.OnMarkingRemoved += OnMarkingChange;
+        CMarkings.OnMarkingColorChange += OnMarkingChange;
+        CMarkings.OnMarkingRankChange += OnMarkingChange;
+
+        #endregion Markings
     }
 
     #region Set
@@ -354,6 +363,15 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
         IsDirty = true;
     }
 
+    private void OnMarkingChange(MarkingSet markings)
+    {
+        if (Profile is null)
+            return;
+
+        Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList()));
+        IsDirty = true;
+    }
+
     #endregion
 
     #region Update
@@ -602,6 +620,18 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
         EyesPicker.SetData(Profile.Appearance.EyeColor);
     }
 
+    private void UpdateMarkings()
+    {
+        if (Profile == null)
+        {
+            return;
+        }
+
+        CMarkings.SetData(Profile.Appearance.Markings, Profile.Species,
+            Profile.Sex, Profile.BodyType, Profile.Appearance.SkinColor, Profile.Appearance.EyeColor
+        );
+    }
+
     #endregion
 
     private void OnSkinColorOnValueChanged()
@@ -688,5 +718,6 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
         UpdateCMarkingsFacialHair();
         UpdateTtsVoicesControls();
         UpdateBodyTypes();
+        UpdateMarkings();
     }
 }

Content.Client/_White/Wizard/Mirror/WizardMirrorWindow.xaml

@@ -80,6 +80,12 @@
                     <humanoid:SingleMarkingPicker Name="CFacialHairPicker" Category="FacialHair" />
                 </BoxContainer>
             </prefUi:HighlightedContainer>
+            <!-- Markings -->
+            <prefUi:HighlightedContainer>
+                <BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
+                        <humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
+                </BoxContainer>
+            </prefUi:HighlightedContainer>
         </BoxContainer>
     </ScrollContainer>
 </DefaultWindow>