Skip to content

Commit 22c0f59

Browse files
onesoundsonesounds
committed
Add badge area in xaml
1 parent b362bc6 commit 22c0f59

File tree

1 file changed

+51
-44
lines changed

1 file changed

+51
-44
lines changed

‎Flow.Launcher/ResultListBox.xaml

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -90,62 +90,69 @@
9090
<ColumnDefinition Width="Auto" />
9191
<ColumnDefinition />
9292
</Grid.ColumnDefinitions>
93-
9493
<Border
9594
x:Name="Bullet"
9695
Grid.Column="0"
9796
Style="{DynamicResource BulletStyle}" />
98-
9997
<Border
10098
Grid.Column="1"
10199
Margin="9 0 0 0"
102100
BorderBrush="Transparent"
103101
BorderThickness="1">
104-
<Image
105-
x:Name="ImageIcon"
106-
Margin="0 0 0 0"
107-
HorizontalAlignment="Center"
108-
IsHitTestVisible="False"
109-
RenderOptions.BitmapScalingMode="Fant"
110-
Source="{Binding Image, TargetNullValue={x:Null}}"
111-
Stretch="Uniform"
112-
StretchDirection="DownOnly"
113-
Style="{DynamicResource ImageIconStyle}"
114-
Visibility="{Binding ShowIcon}">
115-
<Image.Clip>
116-
<EllipseGeometry Center="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource DiameterToCenterPointConverter}}">
117-
<EllipseGeometry.RadiusX>
118-
<MultiBinding Converter="{StaticResource IconRadiusConverter}">
119-
<Binding ElementName="ImageIcon" Path="ActualWidth" />
120-
<Binding Path="Result.RoundedIcon" />
121-
</MultiBinding>
122-
</EllipseGeometry.RadiusX>
123-
<EllipseGeometry.RadiusY>
124-
<MultiBinding Converter="{StaticResource IconRadiusConverter}">
125-
<Binding ElementName="ImageIcon" Path="ActualWidth" />
126-
<Binding Path="Result.RoundedIcon" />
127-
</MultiBinding>
128-
</EllipseGeometry.RadiusY>
129-
</EllipseGeometry>
130-
</Image.Clip>
131-
</Image>
132-
</Border>
133-
<Border
134-
Grid.Column="1"
135-
Margin="9 0 0 0"
136-
BorderBrush="Transparent"
137-
BorderThickness="0">
138-
<TextBlock
139-
x:Name="GlyphIcon"
140-
HorizontalAlignment="Center"
141-
VerticalAlignment="Center"
142-
FontFamily="{Binding Glyph.FontFamily}"
143-
Style="{DynamicResource ItemGlyph}"
144-
Text="{Binding Glyph.Glyph}"
145-
Visibility="{Binding ShowGlyph}" />
102+
<Grid>
103+
<Image
104+
x:Name="ImageIcon"
105+
HorizontalAlignment="Center"
106+
VerticalAlignment="Center"
107+
IsHitTestVisible="False"
108+
RenderOptions.BitmapScalingMode="Fant"
109+
Source="{Binding Image, TargetNullValue={x:Null}}"
110+
Stretch="Uniform"
111+
StretchDirection="DownOnly"
112+
Style="{DynamicResource ImageIconStyle}"
113+
Visibility="{Binding ShowIcon}">
114+
<Image.Clip>
115+
<EllipseGeometry Center="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource DiameterToCenterPointConverter}}">
116+
<EllipseGeometry.RadiusX>
117+
<MultiBinding Converter="{StaticResource IconRadiusConverter}">
118+
<Binding ElementName="ImageIcon" Path="ActualWidth" />
119+
<Binding Path="Result.RoundedIcon" />
120+
</MultiBinding>
121+
</EllipseGeometry.RadiusX>
122+
<EllipseGeometry.RadiusY>
123+
<MultiBinding Converter="{StaticResource IconRadiusConverter}">
124+
<Binding ElementName="ImageIcon" Path="ActualWidth" />
125+
<Binding Path="Result.RoundedIcon" />
126+
</MultiBinding>
127+
</EllipseGeometry.RadiusY>
128+
</EllipseGeometry>
129+
</Image.Clip>
130+
</Image>
131+
132+
<TextBlock
133+
x:Name="GlyphIcon"
134+
HorizontalAlignment="Center"
135+
VerticalAlignment="Center"
136+
FontFamily="{Binding Glyph.FontFamily}"
137+
Style="{DynamicResource ItemGlyph}"
138+
Text="{Binding Glyph.Glyph}"
139+
Visibility="{Binding ShowGlyph}" />
140+
<Image
141+
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"
148+
Source="{Binding Image, TargetNullValue={x:Null}}"
149+
Visibility="{Binding ShowBadge, Converter={StaticResource BoolToVisibilityConverter}}" />
150+
</Grid>
146151
</Border>
147152
</Grid>
148153

154+
155+
149156
<Grid
150157
Grid.Column="1"
151158
Margin="6 0 10 0"

0 commit comments

Comments
 (0)