Skip to content

Commit 6ebba96

Browse files
committed
Req
1 parent 3043297 commit 6ebba96

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
@@ -414,7 +414,6 @@
414414
Grid.Column="1"
415415
VerticalAlignment="Center"
416416
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
417-
MaxLines="1"
418417
TextTrimming="CharacterEllipsis"
419418
TextWrapping="NoWrap">
420419
<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}" />
@@ -480,12 +479,12 @@
480479
<Grid Margin="-16">
481480

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

490489
<ProgressRing
491490
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)