Skip to content

Commit d4e4ebf

Browse files
authored
Code Quality: Fixed a crash when focusing on Omnibar (#17095)
1 parent db98860 commit d4e4ebf

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/Files.App/UserControls/NavigationToolbar.xaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,14 @@
335335
x:Name="Omnibar"
336336
Grid.Column="1"
337337
x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
338-
CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
338+
CurrentSelectedMode="{x:Bind ViewModel.OmnibarCurrentSelectedMode, Mode=TwoWay}"
339339
IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
340340
QuerySubmitted="Omnibar_QuerySubmitted"
341341
SuggestionChosen="Omnibar_SuggestionChosen"
342342
TextChanged="Omnibar_TextChanged">
343343

344344
<controls:OmnibarMode
345+
x:Name="OmnibarPathMode"
345346
IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
346347
IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
347348
IsDefault="True"
@@ -378,6 +379,7 @@
378379
</controls:OmnibarMode>
379380

380381
<controls:OmnibarMode
382+
x:Name="OmnibarCommandPaletteMode"
381383
IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
382384
IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
383385
ModeName="{helpers:ResourceString Name=CommandPalette}"
@@ -420,6 +422,7 @@
420422
</controls:OmnibarMode>
421423

422424
<controls:OmnibarMode
425+
x:Name="OmnibarSearchMode"
423426
IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IsFilled=True}"
424427
IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IconType=Outline}"
425428
ModeName="{helpers:ResourceString Name=Search}"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
2323

2424
private const int MaxSuggestionsCount = 10;
2525

26-
public const string OmnibarPathModeName = "Path";
27-
public const string OmnibarPaletteModeName = "Palette";
28-
public const string OmnibarSearchModeName = "Search";
26+
public const string OmnibarPathModeName = "OmnibarPathMode";
27+
public const string OmnibarPaletteModeName = "OmnibarCommandPaletteMode";
28+
public const string OmnibarSearchModeName = "OmnibarSearchMode";
2929

3030
// Dependency injections
3131

@@ -229,7 +229,7 @@ public bool IsOmnibarFocused
229229
{
230230
if (value)
231231
{
232-
switch(OmnibarCurrentSelectedModeName)
232+
switch(OmnibarCurrentSelectedMode.Name)
233233
{
234234
case OmnibarPathModeName:
235235
PathText =
@@ -243,16 +243,16 @@ public bool IsOmnibarFocused
243243
case OmnibarSearchModeName:
244244
break;
245245
default:
246-
throw new ArgumentOutOfRangeException("");
246+
break;
247247
}
248248

249249
}
250250
}
251251
}
252252
}
253253

254-
private string _OmnibarCurrentSelectedModeName;
255-
public string OmnibarCurrentSelectedModeName { get => _OmnibarCurrentSelectedModeName; set => SetProperty(ref _OmnibarCurrentSelectedModeName, value); }
254+
private OmnibarMode _OmnibarCurrentSelectedMode;
255+
public OmnibarMode OmnibarCurrentSelectedMode { get => _OmnibarCurrentSelectedMode; set => SetProperty(ref _OmnibarCurrentSelectedMode, value); }
256256

257257
private CurrentInstanceViewModel _InstanceViewModel;
258258
public CurrentInstanceViewModel InstanceViewModel

0 commit comments

Comments
 (0)