-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Fix broken button when adding PGR implicitly #15419
Merged
Merged
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
Redth
approved these changes
Jun 2, 2023
/backport to net8.0 |
/backport to release/8.0.1xx-preview5 |
Started backporting to net8.0: https://github.com/dotnet/maui/actions/runs/5159605475 |
Started backporting to release/8.0.1xx-preview5: https://github.com/dotnet/maui/actions/runs/5159606162 |
This was referenced Jun 2, 2023
rmarinho
added a commit
that referenced
this pull request
Jun 14, 2023
* Update Win2D (#15400) Fixes #9104 * Fix broken button when adding PGR implicitly (#15419) * Fix broken button when adding PGR implicitly * - fix conditional * Bump Xamarin.GooglePlayServices.Maps from 118.1.0.1 to 118.1.0.2 (#15409) Bumps [Xamarin.GooglePlayServices.Maps](https://github.com/xamarin/GooglePlayServicesComponents) from 118.1.0.1 to 118.1.0.2. - [Release notes](https://github.com/xamarin/GooglePlayServicesComponents/releases) - [Commits](https://github.com/xamarin/GooglePlayServicesComponents/commits) --- updated-dependencies: - dependency-name: Xamarin.GooglePlayServices.Maps dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Correct docs for Grid ColumnSpacing/RowSpacing (#15425) * Bump Xamarin.Firebase.AppIndexing from 120.0.0.11 to 120.0.0.12 (#15406) Bumps [Xamarin.Firebase.AppIndexing](https://github.com/xamarin/GooglePlayServicesComponents) from 120.0.0.11 to 120.0.0.12. - [Release notes](https://github.com/xamarin/GooglePlayServicesComponents/releases) - [Commits](https://github.com/xamarin/GooglePlayServicesComponents/commits) --- updated-dependencies: - dependency-name: Xamarin.Firebase.AppIndexing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Modify generated ID starting point to prevent collision with ItemViewType (#15438) * Move Windows and iOS Frame measure and arrange to xplat layer (#14987) * Fix Windows frame not resizing with screen Fixes #13552 * Make iOS Frame renderer us shared implementation Moving some frame border calculations to the xplat layer with more shared code * Add test * Auto-format source code * Remove padding update Windows was double counting padding * Fix test for other platforms * Auto-format source code * Fix typo * Add padding test --------- Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com> * Bump Microsoft.NET.Test.Sdk from 17.6.0 to 17.6.1 (#15408) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.0 to 17.6.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.6.0...v17.6.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Pin main branch to net7 (#15452) * [uitests] Fix appium versions (#15453) * Upload appium * Pin all versions * Use variables * Prep better the script * Update dependencies from https://github.com/dotnet/xharness build 20230529.1 (#15450) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23272.1 -> To Version 8.0.0-prerelease.23279.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [net8.0] Don't pin sdk on net8 branch * Add the drag and drop gestures back to the appium ui tests for mac/ios targets * Update ModalNavigationManager.cs (#15483) * Don't reset App.Current OnResume if it's already set (#15496) * First pass at adding developer layout docs (#15426) * First pass at adding developer layout docs * Update docs/design/layout.md Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> * Clear window from ContextStub after it's closed (#15495) * Remove legacy launch settings (#15511) * Skip tests currently having issues on WinUI (#15527) * Skip tests currently having issues * Update AssertionExtensions.Windows.cs * - Update skip notes * - update notes * - update test notes * - update tests that have always been failing * - update test notes * - fix compile errors * Fix incorrect calculation of expansion size when *s have different scalars (#15532) Fixes #15494 * Change the tokens to null (#15560) Co-authored-by: tj-devel709 <tjlambert@microsoft.com> * Add all platforms if build args don't restrict to a single platform (#15561) * Restore & obsolete Windows MauiWebView ctor (#15541) * Restore & obsolete Windows MauiWebView ctor * Reinstate functionality for obsoleted ctor * Ignore additional tests for iOS (#15513) * Bump Microsoft.NET.Test.Sdk from 17.6.1 to 17.6.2 (#15502) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.1 to 17.6.2. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.6.1...v17.6.2) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/xharness build 20230607.1 (#15581) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23279.1 -> To Version 8.0.0-prerelease.23307.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update Versions.props --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com> Co-authored-by: Michael Cao <poppop208@gmail.com> Co-authored-by: Juan Diego Herrera <juherrera@microsoft.com> Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Scott Banning <scoban@microsoft.com> Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: scoban <sbanni@users.noreply.github.com> Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com> Co-authored-by: tj-devel709 <tjlambert@microsoft.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
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.
Description of Change
2c301d7#diff-2d78f02242798d0f2863f679e4dfdee230944be37db5e1a1446bfa4c6c43a5c6R183
Caused a regression with
Button
when you have aPointerOver
visual state added to a control. Whenever a control has aPointerOver
VSM we add a PointerGestureRecognizer to handle that state change. Ideally, we could just add a PGR to everything so the behavior isn't so edge case but that causes accessibility onAndroid
to break so we have to be much more targeted about when adding a PGR (#11742 and #11591 for background)This change most likely isn't 100 percent correct but it should be small enough to return net8 back to working without introducing additional changes in behavior. I'm pretty sure we should be modifying OnTouchEvent to not consume the touch event if the only
GR
is aPGR
or we should just not subscribe to OnTouched if the onlyGR
is aPGR
.