Skip to content

Commit c66cbae

Browse files
committed
- Adjust Badge layout
- Fix glyph margin in win11light
1 parent 8aff3c9 commit c66cbae

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

Flow.Launcher/ResultListBox.xaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@
102102
<Grid>
103103
<Image
104104
x:Name="ImageIcon"
105-
HorizontalAlignment="Center"
106-
VerticalAlignment="Center"
107105
IsHitTestVisible="False"
108106
RenderOptions.BitmapScalingMode="Fant"
109107
Source="{Binding Image, TargetNullValue={x:Null}}"
@@ -131,24 +129,21 @@
131129

132130
<TextBlock
133131
x:Name="GlyphIcon"
134-
HorizontalAlignment="Center"
135-
VerticalAlignment="Center"
136132
FontFamily="{Binding Glyph.FontFamily}"
137133
Style="{DynamicResource ItemGlyph}"
138134
Text="{Binding Glyph.Glyph}"
139135
Visibility="{Binding ShowGlyph}" />
136+
140137
<Image
141138
x:Name="BadgeIcon"
142-
Width="16"
143-
Height="16"
144-
Margin="0 2 4 0"
145-
HorizontalAlignment="Right"
146-
VerticalAlignment="Bottom"
147-
RenderOptions.BitmapScalingMode="Fant"
139+
Width="{Binding ElementName=ImageIcon, Path=ActualWidth}"
140+
Height="{Binding ElementName=ImageIcon, Path=ActualHeight}"
141+
RenderOptions.BitmapScalingMode="HighQuality"
148142
Source="{Binding BadgeImage, TargetNullValue={x:Null}}"
149143
Visibility="{Binding ShowBadge}" />
150144
</Grid>
151145
</Border>
146+
152147
</Grid>
153148

154149
<Grid

Flow.Launcher/Themes/Win11Light.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
BasedOn="{StaticResource BaseGlyphStyle}"
3939
TargetType="{x:Type TextBlock}">
4040
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
41-
<Setter Property="Margin" Value="-4 0 0 0" />
41+
<Setter Property="Margin" Value="0 0 0 0" />
4242
</Style>
4343
<Style
4444
x:Key="QueryBoxStyle"
@@ -180,7 +180,7 @@
180180
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
181181
<Setter Property="VerticalAlignment" Value="Center" />
182182
<Setter Property="HorizontalAlignment" Value="Center" />
183-
<Setter Property="Margin" Value="-4 0 0 0" />
183+
<Setter Property="Margin" Value="0 0 0 0" />
184184
<Setter Property="Width" Value="25" />
185185
<Setter Property="Height" Value="25" />
186186
<Setter Property="FontSize" Value="25" />

0 commit comments

Comments
 (0)