Don't always focus pane content on Tapped, if the pane is already focused #17174
+23
−18
Conversation
This file contains 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
zadjii-msft
changed the title
zadjii-msft
commented
May 1, 2024
| @@ -31,7 +31,8 @@ | |||
| <local:SettingContainer x:Uid="Globals_Language" | |||
| Visibility="{x:Bind ViewModel.LanguageSelectorAvailable}"> | |||
| <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}" | |||
| SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"> | |||
| SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}" | |||
| Style="{StaticResource ComboBoxSettingStyle}"> | |||
There was a problem hiding this comment.
This is a drive-by that I discovered while investigating.
zadjii-msft
commented
May 1, 2024
| @@ -11,7 +11,7 @@ Licensed under the MIT license. | |||
| #include <conattrs.hpp> | |||
| #include "MySettings.g.h" | |||
|
|
|||
| using IFontFeatureMap = winrt::Windows::Foundation::Collections::IMap<winrt::hstring, uint32_t>; | |||
| using IFontFeatureMap = winrt::Windows::Foundation::Collections::IMap<winrt::hstring, float>; | |||
There was a problem hiding this comment.
Another drive-by to fix the scratch app build
lhecker
approved these changes
May 1, 2024
DHowett
reviewed
May 1, 2024
| // Don't focus our content if we're already focused. This prevents a bug | ||
| // where tapping on the arrow in a ComboBox will land in our Tapped handler, | ||
| // and if we steal focus from the ComboBox, it won't open. See GH#17062 | ||
| if (WasLastFocused()) |
There was a problem hiding this comment.
Is there a way for us to check if focus is currently inside our pane? Rather than us trying to remember it.
DHowett
approved these changes
May 1, 2024
Co-authored-by: Leonard Hecker <[email protected]>
DHowett
approved these changes
May 1, 2024
carlos-zamora
approved these changes
May 1, 2024
DHowett
reviewed
May 1, 2024
DHowett
reviewed
May 1, 2024
lhecker
approved these changes
May 2, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
You'll never believe this. Clicking on the dropdown button on a ComboBox doesn't set
e.Tapped = true. It bubbles up, and lands in ourPane'sBorder's tapped handler. And in there, we yeet focus to the first content. We end up stealing focus from the combobox, and then the combobox doesn't actually open its dropdown.So yea we can just fix that. Easy enough.
Closes #17062