Fix issue where SplitView with IsPaneOpen set to False and DisplayMod…

…e set to CompactInline glitching out (#67)
Kinnara · Apr 19, 2020 · 2f4b9df · 2f4b9df
1 parent 28e3146
commit 2f4b9df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/ModernWpf.Controls/SplitView/SplitView.cs b/ModernWpf.Controls/SplitView/SplitView.cs
@@ -4,7 +4,7 @@
 using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
+using System.Windows.Threading;
 using ModernWpf.Controls.Primitives;
 
 namespace ModernWpf.Controls
@@ -41,6 +41,12 @@ private bool IsLightDismissible
 
         public override void OnApplyTemplate()
         {
+            if (_displayModeStates != null)
+            {
+                _displayModeStates.CurrentStateChanging -= OnDisplayModeStatesCurrentStateChanging;
+                _displayModeStates.CurrentStateChanged -= OnDisplayModeStatesCurrentStateChanged;
+            }
+
             base.OnApplyTemplate();
 
             _templateRoot = this.GetTemplateRoot();
@@ -174,7 +180,7 @@ private void UpdateTemplateSettings()
             templateSettings.OpenPaneLength = openPaneLength;
             templateSettings.OpenPaneLengthMinusCompactLength = openPaneLengthMinusCompactLength;
 
-            RefreshDisplayModeState();
+            ReapplyDisplayModeState();
         }
 
         private void UpdatePaneClipRectangle()
@@ -298,7 +304,7 @@ private void UpdateVisualState(bool useTransitions = true)
             UpdateOverlayVisibilityState(useTransitions);
         }
 
-        private void RefreshDisplayModeState()
+        private void ReapplyDisplayModeState()
         {
             if (!_isDisplayModeStateChanging)
             {
@@ -307,8 +313,10 @@ private void RefreshDisplayModeState()
                 {
                     if (!storyboard.CanFreeze)
                     {
-                        storyboard.Remove(_templateRoot);
-                        storyboard.Begin(_templateRoot, HandoffBehavior.SnapshotAndReplace, true);
+                        // Wait for data binding to update the storyboard
+                        Dispatcher.Invoke(() => { }, DispatcherPriority.DataBind);
+
+                        storyboard.Begin(_templateRoot, true);
                     }
                 }
             }

diff --git a/ModernWpf.Controls/SplitView/SplitView.properties.cs b/ModernWpf.Controls/SplitView/SplitView.properties.cs
@@ -29,7 +29,6 @@ private static void OnCompactPaneLengthPropertyChanged(DependencyObject sender,
         private void OnCompactPaneLengthPropertyChanged(DependencyPropertyChangedEventArgs args)
         {
             UpdateTemplateSettings();
-            UpdateDisplayModeState();
         }
 
         #endregion