fix: add associated control when loading items async

sandre58 · Jul 31, 2024 · 2cb1770 · 2cb1770
1 parent e947f2b
commit 2cb1770
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/src/MyNet.Wpf/Styles/Controls.ListBox.xaml b/src/MyNet.Wpf/Styles/Controls.ListBox.xaml
@@ -239,12 +239,13 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             ClipToBounds="False"
                             SnapsToDevicePixels="true">
-                        <Grid p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
-                            <ctrl:DynamicScrollViewer Padding="{TemplateBinding Padding}"
-                                                  ClipToBounds="False"
-                                                  Focusable="false"
-                                                  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                                  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                        <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+                            <ctrl:DynamicScrollViewer x:Name="scrollViewer"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      ClipToBounds="False"
+                                                      Focusable="false"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                 <ItemsPresenter ClipToBounds="False" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </ctrl:DynamicScrollViewer>
                         </Grid>
@@ -824,9 +825,10 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             SnapsToDevicePixels="true">
-                        <Grid p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+                        <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
                             <ContentControl x:Name="ContentControl">
-                                <ctrl:DynamicScrollViewer Padding="{TemplateBinding Padding}"
+                                <ctrl:DynamicScrollViewer x:Name="scrollViewer"
+                                                          Padding="{TemplateBinding Padding}"
                                                           p:ScrollViewerAssist.BubbleVerticalScroll="{TemplateBinding p:ScrollViewerAssist.BubbleVerticalScroll}"
                                                           p:ScrollViewerAssist.IsAutoHideEnabled="{Binding Path=(p:ScrollViewerAssist.IsAutoHideEnabled), RelativeSource={RelativeSource Mode=TemplatedParent}}"
                                                           CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"

diff --git a/src/MyNet.Wpf/Styles/Controls.ListView.xaml b/src/MyNet.Wpf/Styles/Controls.ListView.xaml
@@ -679,8 +679,9 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListView}">
-                    <Grid p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
-                        <ctrl:DynamicScrollViewer Style="{StaticResource MyNet.Style.DynamicScrollViewer.Embedded.ListView}"
+                    <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+                        <ctrl:DynamicScrollViewer x:Name="scrollViewer"
+                                                  Style="{StaticResource MyNet.Style.DynamicScrollViewer.Embedded.ListView}"
                                                   CanContentScroll="{Binding Path=(ScrollViewer.CanContentScroll), RelativeSource={RelativeSource TemplatedParent}}"
                                                   HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                                   VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">

diff --git a/src/MyNet.Wpf/Styles/MyNet.Calendar.xaml b/src/MyNet.Wpf/Styles/MyNet.Calendar.xaml
@@ -626,8 +626,9 @@
                                 </Grid>
 
                                 <!-- Content -->
-                                <Grid p:BusyAssist.AttachService="{Binding BusyService, RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
-                                    <ctrl:DynamicScrollViewer Padding="0"
+                                <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding BusyService, RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+                                    <ctrl:DynamicScrollViewer x:Name="scrollViewer"
+                                                              Padding="0"
                                                               CanContentScroll="True"
                                                               Focusable="False"
                                                               HorizontalScrollBarVisibility="Disabled"

diff --git a/src/MyNet.Wpf/Themes/MyNet.Styles.xaml b/src/MyNet.Wpf/Themes/MyNet.Styles.xaml
@@ -12871,8 +12871,8 @@ Styles\MyNet.VirtualizingWrapPanel.xaml
                   </ItemsControl>
                 </Grid>
                 <!-- Content -->
-                <Grid p:BusyAssist.AttachService="{Binding BusyService, RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
-                  <ctrl:DynamicScrollViewer Padding="0" CanContentScroll="True" Focusable="False" HorizontalScrollBarVisibility="Disabled" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding BusyService, RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+                  <ctrl:DynamicScrollViewer x:Name="scrollViewer" Padding="0" CanContentScroll="True" Focusable="False" HorizontalScrollBarVisibility="Disabled" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                     <Grid>
                       <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="rowHeadersColumn" />
@@ -17261,8 +17261,8 @@ Styles\MyNet.VirtualizingWrapPanel.xaml
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBox}">
           <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="False" SnapsToDevicePixels="true">
-            <Grid p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
-              <ctrl:DynamicScrollViewer Padding="{TemplateBinding Padding}" ClipToBounds="False" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+              <ctrl:DynamicScrollViewer x:Name="scrollViewer" Padding="{TemplateBinding Padding}" ClipToBounds="False" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                 <ItemsPresenter ClipToBounds="False" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
               </ctrl:DynamicScrollViewer>
             </Grid>
@@ -17536,9 +17536,9 @@ Styles\MyNet.VirtualizingWrapPanel.xaml
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBox}">
           <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-            <Grid p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+            <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
               <ContentControl x:Name="ContentControl">
-                <ctrl:DynamicScrollViewer Padding="{TemplateBinding Padding}" p:ScrollViewerAssist.BubbleVerticalScroll="{TemplateBinding p:ScrollViewerAssist.BubbleVerticalScroll}" p:ScrollViewerAssist.IsAutoHideEnabled="{Binding Path=(p:ScrollViewerAssist.IsAutoHideEnabled), RelativeSource={RelativeSource Mode=TemplatedParent}}" CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                <ctrl:DynamicScrollViewer x:Name="scrollViewer" Padding="{TemplateBinding Padding}" p:ScrollViewerAssist.BubbleVerticalScroll="{TemplateBinding p:ScrollViewerAssist.BubbleVerticalScroll}" p:ScrollViewerAssist.IsAutoHideEnabled="{Binding Path=(p:ScrollViewerAssist.IsAutoHideEnabled), RelativeSource={RelativeSource Mode=TemplatedParent}}" CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                   <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                 </ctrl:DynamicScrollViewer>
               </ContentControl>
@@ -19404,8 +19404,8 @@ Styles\MyNet.VirtualizingWrapPanel.xaml
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListView}">
-          <Grid p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
-            <ctrl:DynamicScrollViewer Style="{StaticResource MyNet.Style.DynamicScrollViewer.Embedded.ListView}" CanContentScroll="{Binding Path=(ScrollViewer.CanContentScroll), RelativeSource={RelativeSource TemplatedParent}}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+          <Grid p:BusyAssist.AssociatedControl="{Binding ElementName=scrollViewer}" p:BusyAssist.AttachService="{Binding Path=(b:ItemsControlAsyncBehavior.BusyService), RelativeSource={RelativeSource TemplatedParent}}" p:BusyAssist.Style="{StaticResource MyNet.Styles.BusyControl.Dark.Foreground}">
+            <ctrl:DynamicScrollViewer x:Name="scrollViewer" Style="{StaticResource MyNet.Style.DynamicScrollViewer.Embedded.ListView}" CanContentScroll="{Binding Path=(ScrollViewer.CanContentScroll), RelativeSource={RelativeSource TemplatedParent}}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
               <ItemsPresenter />
             </ctrl:DynamicScrollViewer>
           </Grid>