2.10.0

2025-04-29 18:18:46 +08:00
parent 9c8be3a22e
commit 44aea3e962
63 changed files with 1277 additions and 2004 deletions
@@ -209,7 +209,7 @@
                    </Setter.Value>
                </Setter>
            </Style>
-            <Style TargetType="local:MyScrollViewer">
+            <Style TargetType="local:MyScrollViewer" x:Name="StyleMyScrollViewer">
                <Setter Property="OverridesDefaultStyle" Value="True" />
                <Setter Property="CanContentScroll" Value="False" />
                <Setter Property="PanningMode" Value="VerticalOnly" />
@@ -225,6 +225,7 @@
                    </Setter.Value>
                </Setter>
            </Style>
+            <Style TargetType="local:PageComp" BasedOn="{StaticResource {x:Type local:MyScrollViewer}}" />
            <Style TargetType="ScrollViewer" x:Key="ScrollViewerFullMargin">
                <Setter Property="OverridesDefaultStyle" Value="True" />
                <Setter Property="CanContentScroll" Value="False" />