Skip to content

Commit 288ba59

Browse files
committed
Added an icon to a suggestion item
1 parent a3c54ed commit 288ba59

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
@@ -396,14 +396,18 @@
396396
<ColumnDefinition Width="Auto" />
397397
</Grid.ColumnDefinitions>
398398

399-
<ContentPresenter Grid.Column="0">
400-
<controls:ThemedIcon Style="{ThemeResource App.ThemedIcons.Filter}" />
401-
</ContentPresenter>
399+
<Viewbox
400+
Grid.Column="0"
401+
Width="16"
402+
Height="16">
403+
<ContentPresenter Content="{x:Bind Icon, Mode=OneWay}" />
404+
</Viewbox>
402405

403406
<!-- Primary Title -->
404407
<TextBlock
405408
x:Name="PrimaryDisplayBlock"
406409
Grid.Column="1"
410+
VerticalAlignment="Center"
407411
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
408412
MaxLines="1"
409413
TextTrimming="CharacterEllipsis"
@@ -415,6 +419,7 @@
415419
<keyboard:KeyboardShortcut
416420
x:Name="RightAlignedKeyboardShortcut"
417421
Grid.Column="2"
422+
VerticalAlignment="Center"
418423
HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
419424
</Grid>
420425
</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)