Merge pull request #551 from Korjam/bugfix/550-tree-view-scroll

Bugfix/550 tree view scroll
lepoco · Mar 3, 2023 · 5ae2524 · 5ae2524
2 parents 90c52aa + 3bba186
commit 5ae2524
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Wpf.Ui/Styles/Controls/TreeView.xaml b/src/Wpf.Ui/Styles/Controls/TreeView.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -38,12 +38,21 @@
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="4">
                         <ScrollViewer
-                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                            Name="ItemsPresenterScrollViewer"
+                            CanContentScroll="False"
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter Margin="{TemplateBinding Padding}" />
                         </ScrollViewer>
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="True">
+                            <Setter
+                                TargetName="ItemsPresenterScrollViewer"
+                                Property="CanContentScroll"
+                                Value="True"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>