Skip to content

Fix dialog focus #3249

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
Keboo merged 2 commits into from
Jul 19, 2023
Merged

Fix dialog focus #3249

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
103baee
Add Handler to correctly focus dialog when it is vissible
Talwynox Jun 29, 2023
9eceecc
Centralizing focus logic to remove duplication
Keboo Jul 19, 2023
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
Next Next commit
Add Handler to correctly focus dialog when it is vissible
  • Loading branch information
@Talwynox
Talwynox committed Jun 29, 2023
commit 103baee96cdf06e86ac71a0bae0022ecd131134c
34 changes: 29 additions & 5 deletions MaterialDesignThemes.Wpf/DialogHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,16 +816,40 @@ internal void InternalClose(object? parameter)
if (child is null) return null;

CommandManager.InvalidateRequerySuggested();
var focusable = child.VisualDepthFirstTraversal().OfType<UIElement>().FirstOrDefault(ui => ui.Focusable && ui.IsVisible);
focusable?.Dispatcher.InvokeAsync(() =>
var focusable = child.VisualDepthFirstTraversal().OfType<UIElement>().FirstOrDefault(ui => ui.Focusable);
if (focusable is null) return null;

if (focusable.IsVisible)
{
focusable.Dispatcher.BeginInvoke (() =>
{
if (!focusable.Focus()) return;
focusable.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
}, DispatcherPriority.Background);
}
else
{
if (!focusable.Focus()) return;
focusable.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
}, DispatcherPriority.Background);
focusable.IsVisibleChanged += FocusableOnIsVisibleChanged;
}

return child;
}

private void FocusableOnIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
{
if (sender is UIElement focusable)
{
focusable.Dispatcher.BeginInvoke(
() =>
{
if (!focusable.Focus()) return;
focusable.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
},
DispatcherPriority.Background);
focusable.IsVisibleChanged -= FocusableOnIsVisibleChanged;
}
}

protected override void OnPreviewMouseDown(MouseButtonEventArgs e)
{
if (Window.GetWindow(this) is { } window && !window.IsActive && window.OwnedWindows.OfType<Window>().All(x => !x.IsActive))
Expand Down