From c66cbae78bfa96ecbec3a627ac40bed4d2b442ca Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 12 Apr 2025 00:56:07 +0900
Subject: [PATCH] - Adjust Badge layout - Fix glyph margin in win11light

---
 Flow.Launcher/ResultListBox.xaml     | 15 +++++----------
 Flow.Launcher/Themes/Win11Light.xaml |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 63c461c43..8231027f4 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -102,8 +102,6 @@
                                 <Grid>
                                     <Image
                                         x:Name="ImageIcon"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
                                         IsHitTestVisible="False"
                                         RenderOptions.BitmapScalingMode="Fant"
                                         Source="{Binding Image, TargetNullValue={x:Null}}"
@@ -131,24 +129,21 @@
 
                                     <TextBlock
                                         x:Name="GlyphIcon"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
                                         FontFamily="{Binding Glyph.FontFamily}"
                                         Style="{DynamicResource ItemGlyph}"
                                         Text="{Binding Glyph.Glyph}"
                                         Visibility="{Binding ShowGlyph}" />
+
                                     <Image
                                         x:Name="BadgeIcon"
-                                        Width="16"
-                                        Height="16"
-                                        Margin="0 2 4 0"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Bottom"
-                                        RenderOptions.BitmapScalingMode="Fant"
+                                        Width="{Binding ElementName=ImageIcon, Path=ActualWidth}"
+                                        Height="{Binding ElementName=ImageIcon, Path=ActualHeight}"
+                                        RenderOptions.BitmapScalingMode="HighQuality"
                                         Source="{Binding BadgeImage, TargetNullValue={x:Null}}"
                                         Visibility="{Binding ShowBadge}" />
                                 </Grid>
                             </Border>
+
                         </Grid>
 
                         <Grid
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index a08b8eef9..c24612409 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -38,7 +38,7 @@
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-        <Setter Property="Margin" Value="-4 0 0 0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
@@ -180,7 +180,7 @@
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="-4 0 0 0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
         <Setter Property="Width" Value="25" />
         <Setter Property="Height" Value="25" />
         <Setter Property="FontSize" Value="25" />