Address Graphics state reset issue in DarkMode Button renderers #13641
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #13641 +/- ##
===================================================
+ Coverage 76.75572% 76.75863% +0.00290%
===================================================
Files 3256 3256
Lines 642016 642019 +3
Branches 47548 47548
===================================================
+ Hits 492784 492805 +21
+ Misses 145574 145554 -20
- Partials 3658 3660 +2
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
| @@ -44,39 +45,50 @@ public void RenderButton( | |||
| ArgumentNullException.ThrowIfNull(paintImage); | |||
| ArgumentNullException.ThrowIfNull(paintField); | |||
|
|
|||
| // Clear the background over the whole button area. | |||
| ClearBackground(graphics, parentBackgroundColor); | |||
| GraphicsState? graphicsState = default; | |||
There was a problem hiding this comment.
Use the GraphicsStateScope here and elsewhere.
There was a problem hiding this comment.
It's assumingly the same approach with PenScope and BrushScope, right?
There was a problem hiding this comment.
Similar, but simpler. Should be a lot of other uses. We have scopes for most things that need cleaned up or reset. Reduces nesting and ensures ordering. There are also opportunities to further optimize in some cases as well now that we control the internals of System.Drawing (could, for example, avoid creating wrapper classes in some cases,).
dotnet-policy-service
bot
added
waiting-author-feedback
KlausLoeffelmann
force-pushed
the
DarkModeButtonRendererResetState
branch
from
5e106ae to
dbb74b0
Compare
KlausLoeffelmann
force-pushed
the
DarkModeButtonRendererResetState
branch
from
a3468e5 to
a481476
Compare
KlausLoeffelmann
force-pushed
the
DarkModeButtonRendererResetState
branch
from
a481476 to
0d940b7
Compare
|
|
||
| if (focused && showFocusCues) | ||
| // Scope the graphics state so all changes are reverted after rendering | ||
| using (new GraphicsStateScope(graphics)) |
There was a problem hiding this comment.
| using (new GraphicsStateScope(graphics)) | |
| using GraphicsStateScope graphicsScope = new(graphics); |
KlausLoeffelmann
dismissed
JeremyKuhne’s stale review
Out on vacation, and we need to get this merged.
This PR makes sure, that the Graphics state is reset to the original state after rendering the DarkMode Button but implementing the render logic based on
ButtonDarkModeRendererBase.Follows up respective issues pointed out by the DarkMode feature reviews.
Microsoft Reviewers: Open in CodeFlow