Skip to content

Commit ec68157

Browse files
committed
Req
1 parent 8d5e5d0 commit ec68157

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ namespace Files.App.Data.Items
99
[Obsolete("Remove once Omnibar goes out of experimental.")]
1010
public sealed partial class NavigationBarSuggestionItem : ObservableObject, IOmnibarTextMemberPathProvider
1111
{
12-
// Obsolete but left as is for backwards compatibility
13-
private object? _Icon;
14-
public object? Icon { get => _Icon; set => SetProperty(ref _Icon, value); }
15-
1612
private Style? _ThemedIconStyle;
1713
public Style? ThemedIconStyle { get => _ThemedIconStyle; set => SetProperty(ref _ThemedIconStyle, value); }
1814

src/Files.App/UserControls/NavigationToolbar.xaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@
398398
Grid.Column="1"
399399
VerticalAlignment="Center"
400400
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
401-
MaxLines="1"
402401
TextTrimming="CharacterEllipsis"
403402
TextWrapping="NoWrap">
404403
<Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPreMatched, Mode=OneWay}" /><Run FontWeight="Bold" Text="{x:Bind PrimaryDisplayMatched, Mode=OneWay}" /><Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPostMatched, Mode=OneWay}" />
@@ -477,12 +476,12 @@
477476
<Grid Margin="-16">
478477

479478
<!-- Enable icon again if we add option to always display on the toolbar
480-
<ThemedIcon
481-
x:Name="StatusCenterIcon"
482-
Width="16"
483-
Height="16"
484-
x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
485-
Style="{StaticResource App.ThemedIcons.StatusCenter}" />-->
479+
<ThemedIcon
480+
x:Name="StatusCenterIcon"
481+
Width="16"
482+
Height="16"
483+
x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
484+
Style="{StaticResource App.ThemedIcons.StatusCenter}" />-->
486485

487486
<ProgressRing
488487
x:Name="MedianOperationProgressRing"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,6 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
11441144
command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
11451145
.Select(command => new NavigationBarSuggestionItem()
11461146
{
1147-
Icon = command.Icon,
11481147
ThemedIconStyle = command.Glyph.ToThemedIconStyle(),
11491148
Glyph = command.Glyph.BaseGlyph,
11501149
Text = command.Code.ToString(),

0 commit comments

Comments
 (0)