[Android] GraphicsView scaling after canvas.ResetState #31244
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a GraphicsView scaling issue on Android where content was being rendered at half size after calling canvas.ResetState(). The fix involves modifying the ScalingCanvas to preserve initial scale values when resetting state, eliminating the need for manual scaling in PlatformGraphicsView.
- Adds initial scale tracking to ScalingCanvas with new constructor parameter
- Removes redundant manual scaling call in PlatformGraphicsView.Draw method
- Adds comprehensive UI test to verify the fix
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/Graphics/src/Graphics/ScalingCanvas.cs | Adds initial scale tracking fields and constructor to preserve scale during ResetState() |
| src/Graphics/src/Graphics/Platforms/Android/PlatformGraphicsView.cs | Removes redundant Scale() call and uses new ScalingCanvas constructor with scale parameter |
| src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31182.cs | Adds NUnit test to verify GraphicsView renders at correct size after ResetState() |
| src/Controls/tests/TestCases.HostApp/Issues/Issue31182.cs | Adds test page with GraphicsView that calls ResetState() to reproduce the issue |
| _blurrableCanvas = _canvas as IBlurrableCanvas; | ||
| } | ||
|
|
||
| internal ScalingCanvas(ICanvas wrapped, float scale) : this(wrapped) |
There was a problem hiding this comment.
This introduces a new public API constructor that could be a breaking change. Consider marking this constructor as internal to prevent external usage, or ensure this is documented as a new API addition if intended for public consumption.
Copilot uses AI. Check for mistakes.
|
Hey there @@kubaflo! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
kubaflo
added
platform/android
area-drawing
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
jsuarezruiz
reviewed
Aug 26, 2025
| public void GraphicsViewShouldDrawAtFullSize() | ||
| { | ||
| App.WaitForElement("label"); | ||
| VerifyScreenshot(); |
There was a problem hiding this comment.
Pending snapshot on Windows and Android. Running a build.
There was a problem hiding this comment.
Test failing on Android:
at UITest.Appium.HelperExtensions.Wait(Func`1 query, Func`2 satisfactory, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 2530
at UITest.Appium.HelperExtensions.WaitForAtLeastOne(Func`1 query, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 2547
at UITest.Appium.HelperExtensions.WaitForElement(IApp app, String marked, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency, Nullable`1 postTimeout) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 743
at Microsoft.Maui.TestCases.Tests.Issues.Issue31182.GraphicsViewShouldDrawAtFullSize() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31182.cs:line 17
at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
jsuarezruiz
requested changes
Aug 27, 2025
| public void GraphicsViewShouldDrawAtFullSize() | ||
| { | ||
| App.WaitForElement("label"); | ||
| VerifyScreenshot(); |
| public void GraphicsViewShouldDrawAtFullSize() | ||
| { | ||
| App.WaitForElement("label"); | ||
| VerifyScreenshot(); |
There was a problem hiding this comment.
Test failing on Android:
at UITest.Appium.HelperExtensions.Wait(Func`1 query, Func`2 satisfactory, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 2530
at UITest.Appium.HelperExtensions.WaitForAtLeastOne(Func`1 query, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 2547
at UITest.Appium.HelperExtensions.WaitForElement(IApp app, String marked, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency, Nullable`1 postTimeout) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 743
at Microsoft.Maui.TestCases.Tests.Issues.Issue31182.GraphicsViewShouldDrawAtFullSize() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31182.cs:line 17
at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Note
Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!
Description of Change
Follow-up to #31183
While reviewing the snapshots, I noticed that without calling canvas.ResetState(); in the Draw method, the rendered content size was doubled.
This change removes the unnecessary call to _scalingCanvas.Scale in PlatformGraphicsView. Scaling is already accounted for in the ResetState() method
Issues Fixed
Fixes #31182