From 45250437fdf77983881228d2493f97e977888519 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 19 Nov 2021 11:12:22 +0900
Subject: [PATCH] Change Icon uniform property from uniformtofill (Fix wide
 icon cut)

---
 Flow.Launcher/ResultListBox.xaml | 172 ++++++++++++++++++++-----------
 1 file changed, 112 insertions(+), 60 deletions(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index d52474d3f..c674e9a70 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -1,25 +1,32 @@
-<ListBox x:Class="Flow.Launcher.ResultListBox"
-         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-         xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-         xmlns:converter="clr-namespace:Flow.Launcher.Converters"
-         mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
-         d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
-         MaxHeight="{Binding MaxHeight}"
-         SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
-         SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
-         HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}"
-         Margin="{Binding Margin}"
-         Visibility="{Binding Visbility}"
-         Style="{DynamicResource BaseListboxStyle}" Focusable="False"
-         KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
-         VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard"
-         SelectionChanged="OnSelectionChanged"
-         IsSynchronizedWithCurrentItem="True"
-         PreviewMouseDown="ListBox_PreviewMouseDown">
-    <!--IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083-->
+<ListBox
+    x:Class="Flow.Launcher.ResultListBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converter="clr-namespace:Flow.Launcher.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
+    MaxHeight="{Binding MaxHeight}"
+    Margin="{Binding Margin}"
+    HorizontalContentAlignment="Stretch"
+    d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
+    d:DesignHeight="100"
+    d:DesignWidth="100"
+    Focusable="False"
+    IsSynchronizedWithCurrentItem="True"
+    ItemsSource="{Binding Results}"
+    KeyboardNavigation.DirectionalNavigation="Cycle"
+    PreviewMouseDown="ListBox_PreviewMouseDown"
+    SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+    SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+    SelectionChanged="OnSelectionChanged"
+    SelectionMode="Single"
+    Style="{DynamicResource BaseListboxStyle}"
+    VirtualizingStackPanel.IsVirtualizing="True"
+    VirtualizingStackPanel.VirtualizationMode="Standard"
+    Visibility="{Binding Visbility}"
+    mc:Ignorable="d">
+    <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
     <ListBox.ItemTemplate>
         <DataTemplate>
@@ -30,46 +37,88 @@
                     </ControlTemplate>
                 </Button.Template>
                 <Button.Content>
-                    <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0"
-                          Cursor="Hand" UseLayoutRounding="False">
+                    <Grid
+                        Margin="0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Stretch"
+                        Cursor="Hand"
+                        UseLayoutRounding="False">
                         <Grid.Resources>
-                            <converter:HighlightTextConverter x:Key="HighlightTextConverter"/>
+                            <converter:HighlightTextConverter x:Key="HighlightTextConverter" />
                             <converter:OrdinalConverter x:Key="OrdinalConverter" />
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="60" />
-                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Visibility="{Binding ShowOpenResultHotkey}" Grid.Column="2" Margin="0 0 10 0">
-                            <TextBlock Margin="12 0 12 0" Style="{DynamicResource ItemHotkeyStyle}" HorizontalAlignment="Right" Opacity="0.8" VerticalAlignment="Center" Padding="0 10 0 10" x:Name="Hotkey">
+                        <StackPanel
+                            Grid.Column="2"
+                            Margin="0,0,10,0"
+                            Visibility="{Binding ShowOpenResultHotkey}">
+                            <TextBlock
+                                x:Name="Hotkey"
+                                Margin="12,0,12,0"
+                                Padding="0,10,0,10"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Opacity="0.8"
+                                Style="{DynamicResource ItemHotkeyStyle}">
                                 <TextBlock.Visibility>
-                                    <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" />
+                                    <Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
                                 </TextBlock.Visibility>
                                 <TextBlock.Text>
                                     <MultiBinding StringFormat="{}{0}+{1}">
                                         <Binding Path="OpenResultModifiers" />
-                                        <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OrdinalConverter}" />
+                                        <Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
                                     </MultiBinding>
                                 </TextBlock.Text>
                             </TextBlock>
                         </StackPanel>
-                        <Border BorderThickness="0" BorderBrush="Transparent" Margin="9 0 0 0">
-                            <Image x:Name="ImageIcon" Width="32" Height="32" HorizontalAlignment="Center" Source="{Binding Image}" Visibility="{Binding ShowIcon}"  Margin="0 0 0 0" Stretch="UniformToFill"/>
+                        <Border
+                            Margin="9,0,0,0"
+                            BorderBrush="Transparent"
+                            BorderThickness="0">
+                            <Image
+                                x:Name="ImageIcon"
+                                Width="32"
+                                Height="32"
+                                Margin="0,0,0,0"
+                                HorizontalAlignment="Center"
+                                Source="{Binding Image}"
+                                Stretch="Uniform"
+                                Visibility="{Binding ShowIcon}" />
                         </Border>
-                        <Border BorderThickness="0" BorderBrush="Transparent" Margin="9 0 0 0">
-                            <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Glyph.Glyph}" FontFamily="{Binding Glyph.FontFamily}" Visibility="{Binding ShowGlyph}" Style="{DynamicResource ItemGlyph}"/>
+                        <Border
+                            Margin="9,0,0,0"
+                            BorderBrush="Transparent"
+                            BorderThickness="0">
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontFamily="{Binding Glyph.FontFamily}"
+                                Style="{DynamicResource ItemGlyph}"
+                                Text="{Binding Glyph.Glyph}"
+                                Visibility="{Binding ShowGlyph}" />
                         </Border>
-                        <Grid Margin="6 0 10 0" Grid.Column="1" HorizontalAlignment="Stretch">
+                        <Grid
+                            Grid.Column="1"
+                            Margin="6,0,10,0"
+                            HorizontalAlignment="Stretch">
                             <Grid.RowDefinitions>
                                 <RowDefinition />
-                                <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
+                                <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
                             </Grid.RowDefinitions>
 
-                            <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
-                                       VerticalAlignment="Center" ToolTip="{Binding ShowTitleToolTip}" x:Name="Title"
-                                       Text="{Binding Result.Title}">
+                            <TextBlock
+                                x:Name="Title"
+                                VerticalAlignment="Center"
+                                DockPanel.Dock="Left"
+                                Style="{DynamicResource ItemTitleStyle}"
+                                Text="{Binding Result.Title}"
+                                ToolTip="{Binding ShowTitleToolTip}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.Title" />
@@ -77,8 +126,13 @@
                                     </MultiBinding>
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding ShowSubTitleToolTip}"
-                                       Grid.Row="1" x:Name="SubTitle" Text="{Binding Result.SubTitle}" MinWidth="750">
+                            <TextBlock
+                                x:Name="SubTitle"
+                                Grid.Row="1"
+                                MinWidth="750"
+                                Style="{DynamicResource ItemSubTitleStyle}"
+                                Text="{Binding Result.SubTitle}"
+                                ToolTip="{Binding ShowSubTitleToolTip}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.SubTitle" />
@@ -92,11 +146,9 @@
                     </Grid>
                 </Button.Content>
             </Button>
-            <!-- a result item height is 52 including margin -->
+            <!--  a result item height is 52 including margin  -->
             <DataTemplate.Triggers>
-                <DataTrigger
-                    Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
-                    Value="True">
+                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
                     <Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
                     <Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
                     <Setter TargetName="Hotkey" Property="Style" Value="{DynamicResource ItemHotkeySelectedStyle}" />
@@ -105,7 +157,7 @@
             </DataTemplate.Triggers>
         </DataTemplate>
     </ListBox.ItemTemplate>
-    <!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062-->
+    <!--  http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062  -->
     <ListBox.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
             <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
@@ -117,23 +169,23 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border x:Name="Bd"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                SnapsToDevicePixels="True">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border
+                            x:Name="Bd"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Bd" Property="Background"
-                                        Value="{DynamicResource ItemSelectedBackgroundColor}" />
-                                <Setter TargetName="Bd" Property="BorderBrush"
-                                        Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource ItemSelectedBackgroundColor}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>