Repository navigation
[CP to 1.8] Fix focus not restored after Storage Pickers dialog closes - #6601
Merged
Dinah Xiaoman G (DinahK-2SO) merged 7 commits intoJul 17, 2026
Conversation
**Summary:** Issue reported in #6505. Storage Pickers leave the WinUI window without keyboard focus after their dialog closes, so the keyboard stops working until the user clicks the window again. **Repro:** 1. in code map a button's Click handler with a picker behavior. 2. Click the button (dialog opens), pick a file and confirm (dialog closes), 3. then press Enter. 4. Before the fix Enter does nothing; After the fix Enter re-invokes the button and the dialog reopens. **Fix:** An RAII helper `DialogFocusRestorer` captures the focused window before the dialog opens and restores focus to it once the dialog closes. Applied to all five pick methods. **Commits:** * Restore keyboard focus after Storage Pickers dialog closes (#6505) The COM file dialog runs on a background thread, so SetFocus on close is ignored. Capture the focused window on the UI thread and marshal SetFocus back via the DispatcherQueue. Adds DialogFocusRestorer, applied to all five pick entry points. * add a manual test case
…_focus_fix__CP-1-8
Dinah Xiaoman G (DinahK-2SO)
requested review from
Scott Jones (Scottj1s) and
agniuks
July 9, 2026 07:29
Contributor
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Dinah Xiaoman G (DinahK-2SO)
force-pushed
the
user/DinahK-2SO/storagepickers_focus_fix__CP-1-8
branch
from
July 9, 2026 08:15
f62dfde to
49be3cc
Compare
Contributor
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
Author
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
…_focus_fix__CP-1-8
Scott Jones (Scottj1s)
approved these changes
Jul 16, 2026
Dinah Xiaoman G (DinahK-2SO)
enabled auto-merge (squash)
July 17, 2026 00:27
Contributor
Author
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
Dinah Xiaoman G (DinahK-2SO)
merged commit Jul 17, 2026
33096e4
into
release/1.8-stable
40 checks passed
Dinah Xiaoman G (DinahK-2SO)
deleted the
user/DinahK-2SO/storagepickers_focus_fix__CP-1-8
branch
July 17, 2026 02:16
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a cherry-pick of #6544
Summary:
Issue reported in #6505. Storage Pickers leave the WinUI window without keyboard focus after their dialog closes, so the keyboard stops working until the user clicks the window again.
Repro:
After the fix Enter re-invokes the button and the dialog reopens.
Fix:
An RAII helper
DialogFocusRestorercaptures the focused window before the dialog opens and restores focus to it once the dialog closes. Applied to all five pick methods.