Skip to content

Commit f839afa

Browse files
committed
Added an icon to a suggestion item
1 parent 39d84bb commit f839afa

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/Files.App/Data/Items/NavigationBarSuggestionItem.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ namespace Files.App.Data.Items
88
[Obsolete("Remove once Omnibar goes out of experimental.")]
99
public sealed partial class NavigationBarSuggestionItem : ObservableObject, IOmnibarTextMemberPathProvider
1010
{
11+
private object? _Icon;
12+
public object? Icon
13+
{
14+
get => _Icon;
15+
set => SetProperty(ref _Icon, value);
16+
}
17+
1118
private string? _Text;
1219
public string? Text
1320
{

src/Files.App/UserControls/NavigationToolbar.xaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,14 +380,18 @@
380380
<ColumnDefinition Width="Auto" />
381381
</Grid.ColumnDefinitions>
382382

383-
<ContentPresenter Grid.Column="0">
384-
<controls:ThemedIcon Style="{ThemeResource App.ThemedIcons.Filter}" />
385-
</ContentPresenter>
383+
<Viewbox
384+
Grid.Column="0"
385+
Width="16"
386+
Height="16">
387+
<ContentPresenter Content="{x:Bind Icon, Mode=OneWay}" />
388+
</Viewbox>
386389

387390
<!-- Primary Title -->
388391
<TextBlock
389392
x:Name="PrimaryDisplayBlock"
390393
Grid.Column="1"
394+
VerticalAlignment="Center"
391395
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
392396
MaxLines="1"
393397
TextTrimming="CharacterEllipsis"
@@ -399,6 +403,7 @@
399403
<keyboard:KeyboardShortcut
400404
x:Name="RightAlignedKeyboardShortcut"
401405
Grid.Column="2"
406+
VerticalAlignment="Center"
402407
HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
403408
</Grid>
404409
</DataTemplate>

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,7 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
11471147
command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
11481148
.Select(command => new NavigationBarSuggestionItem()
11491149
{
1150+
Icon = command.Icon,
11501151
Text = command.Code.ToString(),
11511152
PrimaryDisplay = command.Description,
11521153
HotKeys = command.HotKeys,

0 commit comments

Comments
 (0)