Enable DarkMode Theming #10985

KlausLoeffelmann · 2024-03-03T10:19:55Z

Ready for another review pass. We're still aiming for RC1.
There is one test issue left, which will be addressed during next week.

elachlan · 2024-03-04T03:00:53Z

Test failures are caused by white space analyzer errors.

##[error]src\System.Windows.Forms\src\System\Windows\Forms\Controls\ToolStrips\StatusStrip.cs(32,1): error SA1028: (NETCORE_ENGINEERING_TELEMETRY=Build) Code should not contain trailing whitespace (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1028.md)
D:\a\_work\1\s\src\System.Windows.Forms\src\System\Windows\Forms\Controls\ToolStrips\ToolStripManager.cs(573,1): error SA1028: Code should not contain trailing whitespace (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1028.md) [D:\a\_work\1\s\src\System.Windows.Forms\src\System.Windows.Forms.csproj]
##[error]src\System.Windows.Forms\src\System\Windows\Forms\Controls\ToolStrips\ToolStripManager.cs(573,1): error SA1028: (NETCORE_ENGINEERING_TELEMETRY=Build) Code should not contain trailing whitespace (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1028.md)
D:\a\_work\1\s\src\System.Windows.Forms\src\System\Windows\Forms\Controls\ToolStrips\ToolStripManager.cs(575,1): error SA1028: Code should not contain trailing whitespace (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1028.md) [D:\a\_work\1\s\src\System.Windows.Forms\src\System.Windows.Forms.csproj]
##[error]src\System.Windows.Forms\src\System\Windows\Forms\Controls\ToolStrips\ToolStripManager.cs(575,1): error SA1028: (NETCORE_ENGINEERING_TELEMETRY=Build) Code should not contain trailing whitespace (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1028.md)

src/System.Windows.Forms/src/System/Windows/Forms/Control.cs

src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.cs

src/System.Windows.Forms/src/System/Windows/Forms/Application.cs

src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.cs

src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripManager.cs

src/System.Windows.Forms/src/System/Windows/Forms/DarkModeSettings.cs

src/System.Windows.Forms/src/System/Windows/Forms/Form.cs

src/System.Windows.Forms/src/System/Windows/Forms/Application.cs

src/System.Windows.Forms/src/System/Windows/Forms/Theming/ForcedLightThemedSystemColors.cs

kirsan31 · 2024-03-07T08:16:02Z

@KlausLoeffelmann
First of all - thank you 🙏

Problematic controls maybe MonthCalendar, DateTimePicker and definitely TabControl at this point.

I understand that I've already annoyed everyone with this question, but still... At this stage, what can you say about Theming and MDI (#3691)?

KlausLoeffelmann · 2024-03-07T10:07:30Z

I understand that I've already annoyed everyone with this question, but still... At this stage, what can you say about Theming and MDI

That it's not at all likely that it will be addressed in the underlaying layer, which WinForms "just" wraps around. I know it's a disappointing condition, and we're affected ourselves: namely the Designer document (Form) Window. We might be able to brush-up the rendering of the Window title in the WinForms Designer, but it'll only be possible with NC-custom painting. That might work in this case, because the Window is pretty static. But I wouldn't touch it, to be honest, for moving parts.

AraHaan · 2024-03-19T03:06:05Z

I personally do not like the extensive usage of SystemColor in this change. I would prefer the ability to instead pass in (optionally) a type derived from ProfessionalColorTable instead of that. This way not only does it integrate the the existing Renderer types in the API, but also could be used to theme everything as well. Say for example one wants to be able to have a switch from Light, Dark, and Pink mode in their application. With that change they can and besides if we are already exploring theming support might as well invest a little bit extra work to allow custom app defined themes as well 😄. I have such an application where such a change would eliminate thousands of lines of code where I have to manually draw everything or make "fake" versions of controls within winforms today using picture boxes and svg images that I manipulate the colors on using System.Drawing.Common apis. Of which is a pain in the butt to maintain.

Also if by default the non-client area used said type derived from ProfessionalColorTable to draw itself within winforms I would be happy as well as it is then LESS work that I would need to do for my application as well. Same for scrollbars and other not so friendly controls as well that I would need to "fake" in my application that lies inside of any component in winforms that derive from ScrollableControl (just about everything basically).

Also having it like this would promote people to ship special nuget packages that people can install and pass in to their application to use a theme they created using a type derived from ProfessionalColorTable that said packages make public in order to be used with this type of API to then properly render it's theme everywhere that is possible.

KlausLoeffelmann · 2024-03-20T23:27:39Z

Please read my comments on theming in the respective issue.

Thanks!

AraHaan · 2024-03-21T01:09:23Z

Please read my comments on theming in the respective issue.

Thanks!

The SystemColor palette could use the passed in ProfessionalColorTable derived type to provide the colors to use. Doing that could simplify things a bit more.

src/System.Windows.Forms/src/System/Windows/Forms/Application.cs

src/System.Windows.Forms/src/System/Windows/Forms/Control.cs

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs

memoarfaa · 2024-08-09T16:15:34Z

src/System.Windows.Forms/src/System/Windows/Forms/Form.cs

@@ -2425,37 +2430,20 @@ private unsafe void SetFormCornerPreferenceInternal(FormCornerPreference cornerP
    [Experimental(DiagnosticIDs.ExperimentalDarkMode, UrlFormat = Application.WinFormsExperimentalUrl)]
    public Color FormBorderColor


How to return to the orignal System default Color with this api?
(DWMWA_COLOR_DEFAULT with value 0xFFFFFFFF)

How to remove 1px border color around Form with this api ?
(DWMWA_COLOR_NONE with value 0xFFFFFFFE)

Good catch! I will test and add this to the docs! Nice one - adds real value!

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs

JeremyKuhne · 2024-08-09T17:36:33Z

src/System.Windows.Forms/src/System/Windows/Forms/Controls/Buttons/Appearance.cs

+
+    /// <summary>
+    ///  The appearance of a Modern UI toggle switch.
+    ///  This setting is not taken into account, when <see cref="VisualStylesMode"/> is set


The second part of this should be a remarks section.

JeremyKuhne · 2024-08-09T17:48:35Z

src/System.Windows.Forms/src/System/Windows/Forms/Rendering/TextRenderer.cs

@@ -633,14 +633,14 @@ internal static ApplyGraphicsProperties GetApplyStateFlags(IDeviceContext device
            // flag when this was originally written.

            Debug.Assert(apply.HasFlag(ApplyGraphicsProperties.Clipping)
-                || graphics.Clip is null


This file needs undone.

JeremyKuhne · 2024-08-09T17:50:16Z

...em.Windows.Forms/src/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs

+            float radius = rect.Height / 2f;
+
+            using var path = new GraphicsPath();
+            path.AddArc(rect.X, rect.Y, radius * 2, radius * 2, 180, 90);


Is this a rounded rectangle?

JeremyKuhne · 2024-08-09T17:56:31Z

src/System.Windows.Forms/src/System/Windows/Forms/Rendering/Animation/AnimationManager.cs

+
+    private readonly ConcurrentDictionary<AnimatedControlRenderer, AnimationRendererItem> _renderer = [];
+
+    private readonly WindowsFormsSynchronizationContext? _syncContext = (WindowsFormsSynchronizationContext?)SynchronizationContext.Current;


You're going to be grabbing this for whatever the thread happens to be that the static Instance runs on. Is this really what you want? I presume you'd be better off just calling SynchronizationContext.Currrent?.Post() inline.

KlausLoeffelmann · 2024-08-09T21:38:01Z

Locked the discussion, since we need to separate this out into different PRs.
More background info to come soon.

merriemcgaw · 2024-08-09T23:13:07Z

Important!

I've made the extremely hard decision to bump this feature's release to 10. This was coming in awfully hot for .NET 9 RC1 and wasn't looking like everything we needed to do internally (t's crossed and i's dotted) could be addressed in time to meet code complete, which is in just a couple of days. Rather than try to force it into RC1 I decided the best course of action will be to move it to 10 and have it ready to go well before the first preview. Given the bake time it will have in the next release, I think we can be confident of a successful release in 10.

Those of you who are invested in the Dark Mode and VisualStyles work - we want all of the feedback that we can get. You will be able to start seeing builds with this feature work in a few weeks at most when .NET repos move Main to target .NET 10. We have every confidence in this feature and are looking forward to having it ready for you with the very first builds of .NET 10 for your evaluation.

If you have any questions, please don't hesitate to ask on the main issue #7641.

RussKie · 2024-08-12T01:58:25Z

Looks like the dark-mode landed in .NET 9 afterall --> #11857
🎉

merriemcgaw · 2024-08-12T19:09:47Z

Indeed it did! We were able to separate it from the bigger Visual Styles work and get it in for .NET 9. Huge Kudos to @KlausLoeffelmann and @JeremyKuhne for the heroics over the weekend to make sure we had this for .NET 9. Without their above and beyond efforts we would not have been able to make code-complete. Please use and provide feedback!

KlausLoeffelmann added this to the .NET 9.0 milestone Mar 3, 2024

dotnet-policy-service bot assigned KlausLoeffelmann Mar 3, 2024

dotnet-policy-service bot added the draft draft PR label Mar 3, 2024

RussKie reviewed Mar 4, 2024

View reviewed changes

lonitra reviewed Mar 4, 2024

View reviewed changes

src/System.Windows.Forms/src/System/Windows/Forms/Application.cs Outdated Show resolved Hide resolved

src/System.Windows.Forms/src/System/Windows/Forms/Theming/ForcedLightThemedSystemColors.cs Outdated Show resolved Hide resolved

RussKie mentioned this pull request Mar 5, 2024

Migrate theming from net461 to net50 gitextensions/gitextensions#9191

Closed

KlausLoeffelmann changed the title ~~[Proposal] Provide DarkMode Theming~~ Enable DarkMode Theming Mar 6, 2024

This was referenced Mar 6, 2024

Dark mode, the scroll bar theme is incorrect. #10665

Closed

Epic - Align with Win11 look and feel #6270

Open

KlausLoeffelmann changed the base branch from main to Feature/DarkMode March 7, 2024 18:34

KlausLoeffelmann changed the base branch from Feature/DarkMode to main March 7, 2024 19:17

KlausLoeffelmann force-pushed the DarkMode branch from 5b767df to 038bcbf Compare March 7, 2024 19:29

KlausLoeffelmann force-pushed the DarkMode branch from 038bcbf to 3701417 Compare March 18, 2024 18:48

KlausLoeffelmann force-pushed the DarkMode branch 9 times, most recently from fbc724b to 5e189d3 Compare March 27, 2024 05:26

maforget mentioned this pull request Apr 3, 2024

Dark Theme maforget/ComicRackCE#2

Open

KlausLoeffelmann force-pushed the DarkMode branch from 5e189d3 to 8d3b64e Compare April 4, 2024 19:44

KlausLoeffelmann added 8 commits August 5, 2024 23:21

Amend VB App Framework infrastructure props attributes.

4e7ac23

Perform general PR clean up.

bef5954

Fix some VisualStyleMode refactoring issues.

9832595

Fix ref struct issue in release builds.

4a9a108

Update TextBoxBase style default settings.

3c5681c

Add enum range checks, fix minor issues.

2df4dbb

Revert comments mentioning Application.SystemColors.

c61d0d3

Address more review feedback.

3191e93

KlausLoeffelmann force-pushed the DarkMode branch from 7974a57 to 3191e93 Compare August 6, 2024 06:22

RussKie reviewed Aug 6, 2024

View reviewed changes

src/System.Windows.Forms/src/System/Windows/Forms/Application.cs Outdated Show resolved Hide resolved

RussKie reviewed Aug 6, 2024

View reviewed changes

KlausLoeffelmann mentioned this pull request Aug 6, 2024

Add first WinForms Async experimental APIs #11828

Closed

KlausLoeffelmann added 4 commits August 7, 2024 16:04

Fix CTI backwards compatibility test issues.

d43855a

Fix ExperimentalAttrinute url const.

fc8b256

Address additional feedback review.

7f7c0d0

Fix backwards compat issue in Application.RenderWithVisualStyles.

bace995

KlausLoeffelmann force-pushed the DarkMode branch from 9fd3e34 to bace995 Compare August 9, 2024 07:04

Fix some CTI found issues around the new form border attributes APIs.

cf32e9c

KlausLoeffelmann force-pushed the DarkMode branch from 83ca34e to cf32e9c Compare August 9, 2024 15:49

memoarfaa reviewed Aug 9, 2024

View reviewed changes

JeremyKuhne reviewed Aug 9, 2024

View reviewed changes

dotnet locked and limited conversation to collaborators Aug 9, 2024

KlausLoeffelmann closed this Aug 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable DarkMode Theming #10985

Enable DarkMode Theming #10985

KlausLoeffelmann commented Mar 3, 2024 •

edited

Loading

elachlan commented Mar 4, 2024

kirsan31 commented Mar 7, 2024 •

edited

Loading

KlausLoeffelmann commented Mar 7, 2024 •

edited

Loading

AraHaan commented Mar 19, 2024 •

edited

Loading

KlausLoeffelmann commented Mar 20, 2024

AraHaan commented Mar 21, 2024 •

edited

Loading

memoarfaa Aug 9, 2024

KlausLoeffelmann Aug 9, 2024

JeremyKuhne Aug 9, 2024

JeremyKuhne Aug 9, 2024

JeremyKuhne Aug 9, 2024

JeremyKuhne Aug 9, 2024

KlausLoeffelmann commented Aug 9, 2024

merriemcgaw commented Aug 9, 2024

RussKie commented Aug 12, 2024

merriemcgaw commented Aug 12, 2024

		@@ -2425,37 +2430,20 @@ private unsafe void SetFormCornerPreferenceInternal(FormCornerPreference cornerP
		[Experimental(DiagnosticIDs.ExperimentalDarkMode, UrlFormat = Application.WinFormsExperimentalUrl)]
		public Color FormBorderColor


		private readonly ConcurrentDictionary<AnimatedControlRenderer, AnimationRendererItem> _renderer = [];

		private readonly WindowsFormsSynchronizationContext? _syncContext = (WindowsFormsSynchronizationContext?)SynchronizationContext.Current;

Enable DarkMode Theming #10985

Enable DarkMode Theming #10985

Conversation

KlausLoeffelmann commented Mar 3, 2024 • edited Loading

elachlan commented Mar 4, 2024

kirsan31 commented Mar 7, 2024 • edited Loading

KlausLoeffelmann commented Mar 7, 2024 • edited Loading

AraHaan commented Mar 19, 2024 • edited Loading

KlausLoeffelmann commented Mar 20, 2024

AraHaan commented Mar 21, 2024 • edited Loading

memoarfaa Aug 9, 2024

Choose a reason for hiding this comment

KlausLoeffelmann Aug 9, 2024

Choose a reason for hiding this comment

JeremyKuhne Aug 9, 2024

Choose a reason for hiding this comment

JeremyKuhne Aug 9, 2024

Choose a reason for hiding this comment

JeremyKuhne Aug 9, 2024

Choose a reason for hiding this comment

JeremyKuhne Aug 9, 2024

Choose a reason for hiding this comment

KlausLoeffelmann commented Aug 9, 2024

merriemcgaw commented Aug 9, 2024

Important!

RussKie commented Aug 12, 2024

merriemcgaw commented Aug 12, 2024

KlausLoeffelmann commented Mar 3, 2024 •

edited

Loading

kirsan31 commented Mar 7, 2024 •

edited

Loading

KlausLoeffelmann commented Mar 7, 2024 •

edited

Loading

AraHaan commented Mar 19, 2024 •

edited

Loading

AraHaan commented Mar 21, 2024 •

edited

Loading