dev merge master

src/Package.props

@@ -6,10 +6,10 @@
 		<PackageId>WPFDevelopers</PackageId>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Copyright>Copyright © WPFDevelopersOrg 2024</Copyright>
-		<AssemblyVersion>1.1.0.2</AssemblyVersion>
-		<FileVersion>1.1.0.2</FileVersion>
-		<Version>1.1.0.2</Version>
+		<Copyright>Copyright © WPFDevelopersOrg 2025</Copyright>
+		<AssemblyVersion>1.1.0.3</AssemblyVersion>
+		<FileVersion>1.1.0.3</FileVersion>
+		<Version>1.1.0.3</Version>
 		<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
 		<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
 	</PropertyGroup>

src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml → src/WPFDevelopers.Net40/Styles/Styles.TreeView.xaml

@@ -12,28 +12,37 @@
         x:Key="WD.DefaultTreeView"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type TreeView}">
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseBrush}" />
         <Setter Property="Padding" Value="{StaticResource WD.Padding}" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="TreeView">
+                <ControlTemplate TargetType="{x:Type TreeView}">
                     <controls:WDBorder
                         Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="True">
-                        <ScrollViewer
-                            CanContentScroll="False"
+                        <controls:WDScrollViewer
+                            x:Name="PART_ScrollViewer"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
                             Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}"
-                            Focusable="False">
+                            Focusable="False"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            IsScrollAnimation="{Binding Path=(helpers:TreeViewHelper.IsScrollAnimation), RelativeSource={RelativeSource TemplatedParent}}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter />
-                        </ScrollViewer>
+                        </controls:WDScrollViewer>
                     </controls:WDBorder>
                 </ControlTemplate>
             </Setter.Value>
@@ -125,13 +134,10 @@
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type TreeViewItem}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource WD.TreeViewItemFocusVisual}" />
-        <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource AncestorType=TreeView}, Path=FontSize}" />
-        <Setter Property="FontWeight" Value="{Binding RelativeSource={RelativeSource AncestorType=TreeView}, Path=FontWeight}" />
-        <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource AncestorType=TreeView}, Path=FontFamily}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TreeViewItem}">
@@ -143,12 +149,12 @@
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
                         </Grid.RowDefinitions>
                         <ToggleButton
                             x:Name="Expander"
                             ClickMode="Press"
-                            IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                            IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                             Style="{StaticResource WD.ExpandCollapseToggleStyle}" />
                         <Border
                             x:Name="PART_Border"
@@ -162,7 +168,8 @@
                             <ContentPresenter
                                 x:Name="PART_Header"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                ContentSource="Header" />
+                                ContentSource="Header"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <Border
                             x:Name="PART_ItemsHost"
@@ -206,15 +213,16 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="True" />
-                                <Condition Property="IsSelectionActive" Value="False" />
+                                <Condition SourceName="PART_Border" Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BackgroundBrush}" />
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseMoveBrush}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style BasedOn="{StaticResource WD.DefaultTreeView}" TargetType="{x:Type TreeView}" />
     <Style BasedOn="{StaticResource WD.DefaultTreeViewItem}" TargetType="{x:Type TreeViewItem}" />
 </ResourceDictionary>

src/WPFDevelopers.Net40/Themes/Generic.xaml

@@ -27,6 +27,11 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wd:Window}">
+                    <ControlTemplate.Resources>
+                        <Style TargetType="Grid">
+                            <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                    </ControlTemplate.Resources>
                     <Border
                         Name="PART_Border"
                         Background="{TemplateBinding Background}"