更新

2025-07-11 09:20:23 +08:00
parent c7b104f44f
commit 4d35cadb56
840 changed files with 102347 additions and 11595 deletions
--- a/WPFluent/Controls/Scroll/SmoothScrollViewer.xaml
+++ b/WPFluent/Controls/Scroll/SmoothScrollViewer.xaml
@@ -1,8 +1,10 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:WPFluent.Controls">
-
+    xmlns:local="clr-namespace:WPFluent.Controls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Scroll/ScrollViewer.xaml" />
+    </ResourceDictionary.MergedDictionaries>
    <Style BasedOn="{StaticResource DefaultScrollViewerStyle}" TargetType="{x:Type local:SmoothScrollViewer}">
        <Setter Property="PanningMode" Value="Both" />
    </Style>