From f8d075f1d6f15dbcd78845b801d20c72c45b7910 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 12 Jan 2024 13:21:14 +0100
Subject: [PATCH] [PTRun]Bump WPFUI version to preview-13 and fix scrollbar
 issue (#30859)

* Bump wpfui version to preview 13

* Fix margin for results list

* Fix margin on results listview as well
---
 Directory.Packages.props                           | 2 +-
 NOTICE.md                                          | 2 +-
 src/modules/launcher/PowerLauncher/MainWindow.xaml | 9 +++++++++
 src/modules/launcher/PowerLauncher/ResultList.xaml | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index c529d1cd4e..8bd4961c6d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -83,7 +83,7 @@
     <PackageVersion Include="Vanara.PInvoke.User32" Version="3.4.11" />
     <PackageVersion Include="Vanara.PInvoke.Shell32" Version="3.4.11" />
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
-    <PackageVersion Include="WPF-UI" Version="3.0.0-preview.12" />
+    <PackageVersion Include="WPF-UI" Version="3.0.0-preview.13" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsExperimentationLive)'!=''">
     <!-- Additional dependencies used by experimentation -->
diff --git a/NOTICE.md b/NOTICE.md
index b8b9a82f4a..91c60eb2be 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1367,5 +1367,5 @@ EXHIBIT A -Mozilla Public License.
 - Vanara.PInvoke.Shell32 3.4.11
 - Vanara.PInvoke.User32 3.4.11
 - WinUIEx 2.2.0
-- WPF-UI 3.0.0-preview.12
+- WPF-UI 3.0.0-preview.13
 
diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml
index 89255fc6bb..43f7d9ac27 100644
--- a/src/modules/launcher/PowerLauncher/MainWindow.xaml
+++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml
@@ -72,6 +72,7 @@
                 x:Name="pluginsHintsList"
                 Grid.Row="1"
                 Margin="16,0,0,0"
+                Padding="0,0,32,0"
                 ItemContainerStyle="{StaticResource PluginsListViewItemStyle}"
                 ItemsSource="{Binding Plugins}"
                 PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp"
@@ -79,6 +80,14 @@
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                 SelectedItem="{Binding SelectedPlugin, Mode=TwoWay}"
                 SelectionMode="Single">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel
+                            Margin="16,0"
+                            IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                            VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <Grid>
diff --git a/src/modules/launcher/PowerLauncher/ResultList.xaml b/src/modules/launcher/PowerLauncher/ResultList.xaml
index fb040144be..0c8f69b21e 100644
--- a/src/modules/launcher/PowerLauncher/ResultList.xaml
+++ b/src/modules/launcher/PowerLauncher/ResultList.xaml
@@ -45,7 +45,7 @@
         <ListView.ItemsPanel>
             <ItemsPanelTemplate>
                 <VirtualizingStackPanel
-                    Margin="12,12,0,0"
+                    Margin="12,12,12,0"
                     IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
                     VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
             </ItemsPanelTemplate>