BitmapCache-related improvements

zyj0021 · Mar 30, 2020 · 0777892 · 0777892
1 parent dcae0da
commit 0777892
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/ModernWpf.Controls/Flyout/Flyout.cs b/ModernWpf.Controls/Flyout/Flyout.cs
@@ -113,7 +113,7 @@ private void PlayOpenAnimation()
 #if NETCOREAPP || NET462
                 var bitmapCache = new BitmapCache(VisualTreeHelper.GetDpi(presenter).PixelsPerDip);
 #else
-                var bitmapCache = new BitmapCache();
+                var bitmapCache = s_bitmapCacheMode;
 #endif
                 presenter.CacheMode = bitmapCache;
             }

diff --git a/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuEx.cs b/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuEx.cs
@@ -35,7 +35,7 @@ public class HamburgerMenuEx : HamburgerMenu
         private static readonly PropertyPath _scaleYPath = new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)");
         private static readonly PropertyPath _translateYPath = new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[1].(TranslateTransform.Y)");
 
-        private static readonly BitmapCache _bitmapCacheMode = new BitmapCache();
+        private readonly BitmapCache _bitmapCacheMode = new BitmapCache();
 
         private UIElement _paneGrid;
         private Button _paneSearchButton;
@@ -506,6 +506,15 @@ public override void OnApplyTemplate()
             ChangeItemFocusVisualStyle();
         }
 
+#if NETCOREAPP || NET462
+        protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
+        {
+            base.OnDpiChanged(oldDpi, newDpi);
+
+            _bitmapCacheMode.RenderAtScale = newDpi.PixelsPerDip;
+        }
+#endif
+
         private static void OnDisplayModePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             ((HamburgerMenuEx)d).OnDisplayModeChanged(e);

diff --git a/ModernWpf/Transitions/TransitionFrame.cs b/ModernWpf/Transitions/TransitionFrame.cs
@@ -575,7 +575,7 @@ private static void CompleteTransition(NavigationTransition navigationTransition
         /// <param name="presenter">The content presenter instance.</param>
         /// <param name="applyBitmapCache">A value indicating whether to apply
         /// a bitmap cache.</param>
-        private static void PrepareContentPresenterForCompositor(ContentPresenter presenter, bool applyBitmapCache = true)
+        private static void PrepareContentPresenterForCompositor(ContentPresenter presenter, bool applyBitmapCache = false)
         {
             if (presenter != null)
             {

diff --git a/ModernWpf/Transitions/Transitions/Transition.cs b/ModernWpf/Transitions/Transitions/Transition.cs
@@ -212,7 +212,11 @@ private void Save()
             _cacheMode = _element.CacheMode;
             if (!(_cacheMode is BitmapCache))
             {
+#if NETCOREAPP || NET462
+                _element.CacheMode = new BitmapCache(VisualTreeHelper.GetDpi(_element).PixelsPerDip);
+#else
                 _element.CacheMode = TransitionFrame.BitmapCacheMode;
+#endif
             }
             _isHitTestVisible = _element.IsHitTestVisible;
             if (_isHitTestVisible)