Skip to content

Code Quality: Fixed a crash when focusing on Omnibar #17095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2025
Merged

Code Quality: Fixed a crash when focusing on Omnibar #17095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Files.App/UserControls/NavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,14 @@
x:Name="Omnibar"
Grid.Column="1"
x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
CurrentSelectedMode="{x:Bind ViewModel.OmnibarCurrentSelectedMode, Mode=TwoWay}"
IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
QuerySubmitted="Omnibar_QuerySubmitted"
SuggestionChosen="Omnibar_SuggestionChosen"
TextChanged="Omnibar_TextChanged">

<controls:OmnibarMode
x:Name="OmnibarPathMode"
IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
IsDefault="True"
Expand Down Expand Up @@ -378,6 +379,7 @@
</controls:OmnibarMode>

<controls:OmnibarMode
x:Name="OmnibarCommandPaletteMode"
IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
ModeName="{helpers:ResourceString Name=CommandPalette}"
Expand Down Expand Up @@ -420,6 +422,7 @@
</controls:OmnibarMode>

<controls:OmnibarMode
x:Name="OmnibarSearchMode"
IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IsFilled=True}"
IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IconType=Outline}"
ModeName="{helpers:ResourceString Name=Search}"
Expand Down
14 changes: 7 additions & 7 deletions src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr

private const int MaxSuggestionsCount = 10;

public const string OmnibarPathModeName = "Path";
public const string OmnibarPaletteModeName = "Palette";
public const string OmnibarSearchModeName = "Search";
public const string OmnibarPathModeName = "OmnibarPathMode";
public const string OmnibarPaletteModeName = "OmnibarCommandPaletteMode";
public const string OmnibarSearchModeName = "OmnibarSearchMode";

// Dependency injections

Expand Down Expand Up @@ -229,7 +229,7 @@ public bool IsOmnibarFocused
{
if (value)
{
switch(OmnibarCurrentSelectedModeName)
switch(OmnibarCurrentSelectedMode.Name)
{
case OmnibarPathModeName:
PathText =
Expand All @@ -243,16 +243,16 @@ public bool IsOmnibarFocused
case OmnibarSearchModeName:
break;
default:
throw new ArgumentOutOfRangeException("");
break;
}

}
}
}
}

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

private CurrentInstanceViewModel _InstanceViewModel;
public CurrentInstanceViewModel InstanceViewModel
Expand Down
Loading