Skip to content

Commit 0e41dd0

Browse files
Solve merge conflict.
1 parent 7fc5313 commit 0e41dd0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@ private static int GetSystemColorModeInternal()
386386
[Experimental(DiagnosticIDs.ExperimentalDarkMode, UrlFormat = DiagnosticIDs.UrlFormat)]
387387
public static bool IsDarkModeEnabled =>
388388
!SystemInformation.HighContrast
389-
&& (SystemColorMode == SystemColorMode.Dark);
389+
&& (ColorMode == SystemColorMode.Dark
390+
|| (ColorMode == SystemColorMode.System && SystemColorMode == SystemColorMode.Dark));
390391

391392
/// <summary>
392393
/// Gets the path for the executable file that started the application.

0 commit comments

Comments
 (0)