From 32e3813eb13a2aed2238e6d43e0ba5f87d71e6f0 Mon Sep 17 00:00:00 2001
From: Peter Kirmeier <topeterk@users.noreply.github.com>
Date: Wed, 9 Nov 2022 23:34:27 +0100
Subject: [PATCH] Correct height of row items

---
 UserInterface/Menu.xaml    | 13 ++++++++-----
 UserInterface/Menu.xaml.cs | 10 +++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/UserInterface/Menu.xaml b/UserInterface/Menu.xaml
index d3f1c70..43c080c 100644
--- a/UserInterface/Menu.xaml
+++ b/UserInterface/Menu.xaml
@@ -9,7 +9,7 @@
         xmlns:utils="clr-namespace:SystemTrayMenu.Utilities"
         xmlns:local="clr-namespace:SystemTrayMenu.UserInterface"
         x:Class="SystemTrayMenu.UserInterface.Menu"
-        mc:Ignorable="d" ResizeMode="NoResize" WindowStyle="None" Topmost="True" Background="Transparent" AllowsTransparency="True" SizeToContent="WidthAndHeight" ShowInTaskbar="False">
+        mc:Ignorable="d" ResizeMode="NoResize" WindowStyle="None" Topmost="True" Background="Transparent" AllowsTransparency="True" SizeToContent="WidthAndHeight" ShowInTaskbar="False" SnapsToDevicePixels="True" UseLayoutRounding="True">
     <Window.Effect>
         <DropShadowEffect/>
     </Window.Effect>
@@ -121,12 +121,12 @@
                 </Button>
             </DockPanel>
 
-            <ListView x:Name="dgv" x:FieldModifier="internal" Margin="6,0" d:ItemsSource="{d:SampleData ItemCount=5}" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderBrush="{x:Null}" Background="{x:Null}">
+            <ListView x:Name="dgv" x:FieldModifier="internal" Margin="6,0" d:ItemsSource="{d:SampleData ItemCount=5}" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderBrush="{x:Null}" Background="{x:Null}" SelectionMode="Single">
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <Image Width="{DynamicResource ColumnIconWidth}" Source="{Binding ColumnIcon, Converter={utils:IconToImageSourceConverter}}"/>
-                            <Label Width="{DynamicResource ColumnTextWidth}" Margin="6,0" Padding="0" VerticalContentAlignment="Center">
+                        <StackPanel Orientation="Horizontal" Height="{DynamicResource RowHeight}">
+                            <Image Width="{DynamicResource ColumnIconWidth}" Margin="0,2,0,3" Source="{Binding ColumnIcon, Converter={utils:IconToImageSourceConverter}}" />
+                            <Label Width="{DynamicResource ColumnTextWidth}" Margin="3,0" Padding="0" VerticalContentAlignment="Center">
                                 <TextBlock TextTrimming="CharacterEllipsis" Text="{Binding ColumnText}"/>
                             </Label>
                         </StackPanel>
@@ -134,6 +134,9 @@
                 </ListView.ItemTemplate>
                 <ListView.ItemContainerStyle>
                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="Padding" Value="0"/>
                         <EventSetter Event="MouseEnter" Handler="ListViewItem_MouseEnter" />
                         <EventSetter Event="MouseLeave" Handler="ListViewItem_MouseLeave" />
                         <EventSetter Event="PreviewMouseDown" Handler="ListViewItem_MouseDown" />
diff --git a/UserInterface/Menu.xaml.cs b/UserInterface/Menu.xaml.cs
index d6e42e8..f5cde7a 100644
--- a/UserInterface/Menu.xaml.cs
+++ b/UserInterface/Menu.xaml.cs
@@ -890,14 +890,14 @@ namespace SystemTrayMenu.UserInterface
                     // 175% = 33 instead 37, 200% = 35 instead 42
                     // #418 use 21 as default and scale it manually
                     double rowHeightDefault = 21.24f * Scaling.FactorByDpi;
-                    Resources["RowHeight"] = (double)((rowHeightDefault * factor * Scaling.Factor) + 0.5);
+                    Resources["RowHeight"] = (double)(int)((rowHeightDefault * factor * Scaling.Factor) + 0.5);
                     dgv.Tag = true;
                 }
             }
             else
             {
                 // Take over the height from predecessor menu
-                Resources["RowHeight"] = (double)menuPredecessor.Resources["RowHeight"];
+                Resources["RowHeight"] = (double)(int)menuPredecessor.Resources["RowHeight"];
                 dgv.Tag = true;
             }
 
@@ -944,7 +944,7 @@ namespace SystemTrayMenu.UserInterface
             double factorIconSizeInPercent = Properties.Settings.Default.IconSizeInPercent / 100f;
             // IcoWidth 100% = 21px, 175% is 33, +3+2 is padding from ColumnIcon
             double icoWidth = (16 * Scaling.FactorByDpi) + 5;
-            Resources["ColumnIconWidth"] = (double)((icoWidth * factorIconSizeInPercent * Scaling.Factor) + 0.5);
+            Resources["ColumnIconWidth"] = (double)(int)((icoWidth * factorIconSizeInPercent * Scaling.Factor) + 0.5);
 
             double renderedMaxWidth = 0D;
             foreach (ListViewItemData item in dgv.Items)
@@ -1342,6 +1342,10 @@ namespace SystemTrayMenu.UserInterface
             {
                 timerUpdateIcons.Stop();
             }
+            else
+            {
+                ((CollectionView)CollectionViewSource.GetDefaultView(dgv.ItemsSource)).Refresh();
+            }
         }
 
         private void Menu_MouseDown(object sender, MouseButtonEventArgs e)