Skip to content
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

Jump to bottom

Fix Crash on Right-Click of Item When Path Bar is Focused #578

Merged
merged 1 commit into from
Apr 12, 2020
Merged

Fix Crash on Right-Click of Item When Path Bar is Focused #578

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
8 changes: 5 additions & 3 deletions Files/UserControls/NavigationToolbar/ModernNavigationToolbar.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,12 @@ public async void CheckPathInput(ItemViewModel instance, string CurrentInput)

private void VisiblePath_LostFocus(object sender, RoutedEventArgs e)
{
if (FocusManager.GetFocusedElement() is FlyoutBase || FocusManager.GetFocusedElement() is AppBarButton) { return; }
if (FocusManager.GetFocusedElement() is FlyoutBase || FocusManager.GetFocusedElement() is AppBarButton || FocusManager.GetFocusedElement() is Popup) { return; }

var element = FocusManager.GetFocusedElement() as Control;
if (element.FocusState != FocusState.Programmatic && element.FocusState != FocusState.Keyboard)
var element = FocusManager.GetFocusedElement();
var elementAsControl = element as Control;

if (elementAsControl.FocusState != FocusState.Programmatic && elementAsControl.FocusState != FocusState.Keyboard)
{
App.CurrentInstance.NavigationToolbar.IsEditModeEnabled = false;
}
Expand Down