gitextensions
diff --git a/‎.editorconfig
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion b/‎.editorconfig
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎setup/installer/Product.wxs
Copy file name to clipboard
+7-3Lines changed: 7 additions & 3 deletions b/‎setup/installer/Product.wxs
Copy file name to clipboard
+7-3Lines changed: 7 additions & 3 deletions
diff --git a/‎src/app/BugReporter/BugReportForm.cs
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎src/app/BugReporter/BugReportForm.cs
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/app/GitExtUtils/GitUI/Theming/AppColorDefaults.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/app/GitExtUtils/GitUI/Theming/AppColorDefaults.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/app/GitExtUtils/GitUI/Theming/Theme.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/app/GitExtUtils/GitUI/Theming/Theme.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/app/GitExtUtils/GitUI/Theming/ThemeFix.cs
Copy file name to clipboard
+18-4Lines changed: 18 additions & 4 deletions b/‎src/app/GitExtUtils/GitUI/Theming/ThemeFix.cs
Copy file name to clipboard
+18-4Lines changed: 18 additions & 4 deletions
diff --git a/‎src/app/GitUI/CommandsDialogs/BrowseDialog/DashboardControl/Dashboard.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎src/app/GitUI/CommandsDialogs/BrowseDialog/DashboardControl/Dashboard.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎src/app/GitUI/CommandsDialogs/FormCommit.cs
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎src/app/GitUI/CommandsDialogs/FormCommit.cs
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/app/GitUI/CommandsDialogs/FormRebase.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/app/GitUI/CommandsDialogs/FormRebase.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/app/GitUI/CommandsDialogs/SettingsDialog/Pages/ScriptsSettingsPage.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎src/app/GitUI/CommandsDialogs/SettingsDialog/Pages/ScriptsSettingsPage.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
@@ -296,7 +296,11 @@ csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimenta
 csharp_style_prefer_pattern_matching = true:silent
 csharp_style_prefer_not_pattern = true:suggestion
 csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
 
 # WFO1000: A property should determine its property content serialization with the DesignerSerializationVisibilityAttribute, DefaultValueAttribute or the ShouldSerializeProperty method
 # Silent for now, see https://github.com/dotnet/winforms/issues/12476
-dotnet_diagnostic.WFO1000.severity = silent
+dotnet_diagnostic.WFO1000.severity = silent
+
+# WFO5001: Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+dotnet_diagnostic.WFO5001.severity = silent
@@ -314,8 +314,11 @@
       <Component Id="Themes.light_plus.css" Guid="*">
         <File Source="$(var.ArtifactsPublishPath)\Themes\light+.css" />
       </Component>
-      <Component Id="Themes.highcontrast_dark.css" Guid="*">
-        <File Source="$(var.ArtifactsPublishPath)\Themes\highcontrast_dark.css" />
+      <Component Id="Themes.dark.css" Guid="*">
+        <File Source="$(var.ArtifactsPublishPath)\Themes\dark.css" />
+      </Component>
+      <Component Id="Themes.dark_plus.css" Guid="*">
+        <File Source="$(var.ArtifactsPublishPath)\Themes\dark+.css" />
       </Component>
     </DirectoryRef>
     <DirectoryRef Id="PluginsDir">
@@ -606,8 +609,9 @@
     <ComponentGroup Id="Component.Themes">
       <ComponentRef Id="Themes.README.md" />
       <ComponentRef Id="Themes.invariant.css" />
-      <ComponentRef Id="Themes.highcontrast_dark.css" />
       <ComponentRef Id="Themes.light_plus.css" />
+      <ComponentRef Id="Themes.dark.css" />
+      <ComponentRef Id="Themes.dark_plus.css" />
     </ComponentGroup>
     <ComponentGroup Id="Component.Translation">
       <ComponentRef Id="English.gif" />
 
@@ -14,6 +14,7 @@
 using GitExtensions.Extensibility.Translations;
 using GitExtensions.Extensibility.Translations.Xliff;
 using GitExtUtils.GitUI;
+using GitExtUtils.GitUI.Theming;
 using GitUI;
 using Microsoft;
 using ResourceManager;
@@ -126,6 +127,12 @@ public DialogResult ShowDialog(IWin32Window? owner, SerializableException except
             return result;
         }
 
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            this.FixVisualStyle();
+        }
+
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
 
@@ -58,7 +58,7 @@ public static class AppColorDefaults
                 { AppColor.AnsiTerminalWhiteForeNormal, Color.FromArgb(0xbf, 0xbf, 0xbf) },
                 { AppColor.AnsiTerminalWhiteBackNormal, Color.FromArgb(0xe0, 0xe0, 0xe0) },
                 { AppColor.AnsiTerminalWhiteForeBold, Color.FromArgb(0xff, 0xff, 0xff) },
-                { AppColor.AnsiTerminalWhiteBackBold, Color.FromArgb(0xff, 0xff, 0xff) }
+                { AppColor.AnsiTerminalWhiteBackBold, Color.FromArgb(0xff, 0xff, 0xff) },
             };
 
         private static readonly Dictionary<string, Dictionary<AppColor, Color>> _variations = new()
 
@@ -55,7 +55,7 @@ private Color GetSysColor(KnownColor name) =>
         /// </summary>
         private static IReadOnlyCollection<KnownColor> SysColorNames { get; } =
             new HashSet<KnownColor>(
-                Enum.GetValues(typeof(KnownColor))
+                Enum.GetValues<KnownColor>()
                     .Cast<KnownColor>()
                     .Where(c => IsSystemColor(c)));
 
 
@@ -21,8 +21,8 @@ public static void FixVisualStyle(this Control container)
                 return;
             }
 
-            container.DescendantsToFix<GroupBox>()
-                 .ForEach(SetupGroupBox);
+            container.DescendantsToFix<DataGridView>()
+                .ForEach(SetupDataGridView);
             container.DescendantsToFix<TreeView>()
                 .ForEach(SetupTreeView);
             container.DescendantsToFix<TabControl>()
@@ -33,6 +33,8 @@ public static void FixVisualStyle(this Control container)
                 .ForEach(SetupLinkLabel);
             container.DescendantsToFix<ToolStrip>()
                 .ForEach(SetupToolStrip);
+            container.DescendantsToFix<Button>()
+                .ForEach(SetupButton);
             container.ContextMenusToFix()
                 .ForEach(SetupContextMenu);
         }
@@ -81,9 +83,15 @@ private static void SetupLinkLabel(this LinkLabel label)
             label.ActiveLinkColor = label.ActiveLinkColor.AdaptTextColor();
         }
 
-        private static void SetupGroupBox(this GroupBox box)
+        private static void SetupButton(this Button button)
         {
-            box.TouchForeColor();
+            // .net9 fix for https://github.com/dotnet/winforms/issues/11949 (only supposed to occur for 100%)
+            if (Application.IsDarkModeEnabled && button.FlatStyle == FlatStyle.Standard)
+            {
+                // In addition to not setting the BackColor (TouchBackColor() will fix),
+                // FlatStyle.Standard buttons look ugly in dark mode
+                button.FlatStyle = FlatStyle.Flat;
+            }
         }
 
         private static void SetupTabControl(TabControl tabControl)
@@ -101,6 +109,12 @@ private static void SetupTabPage(TabPage page)
             }
         }
 
+        private static void SetupDataGridView(DataGridView view)
+        {
+            view.EnableHeadersVisualStyles = false;
+            view.ColumnHeadersDefaultCellStyle.BackColor = view.ColumnHeadersDefaultCellStyle.BackColor;
+        }
+
         private static void SetupTreeView(TreeView view)
         {
         }
 
@@ -4,7 +4,6 @@
 using GitExtUtils.GitUI;
 using GitExtUtils.GitUI.Theming;
 using GitUI.Properties;
-using GitUI.Theming;
 using ResourceManager;
 
 namespace GitUI.CommandsDialogs.BrowseDialog.DashboardControl
@@ -56,7 +55,7 @@ protected override void OnVisibleChanged(EventArgs e)
 
         public void RefreshContent()
         {
-            DashboardTheme selectedTheme = ThemeModule.IsDarkTheme ? DashboardTheme.Dark : DashboardTheme.Light;
+            DashboardTheme selectedTheme = Application.IsDarkModeEnabled ? DashboardTheme.Dark : DashboardTheme.Light;
 
             InitDashboardLayout();
             ApplyTheme();
 
@@ -205,10 +205,13 @@ private CommitKind CommitKind
                 _commitKind = value;
 
                 modifyCommitMessageButton.Visible = _useFormCommitMessage && CommitKind is not (CommitKind.Normal or CommitKind.Amend);
+                modifyCommitMessageButton.ForeColor = Application.IsDarkModeEnabled ? SystemColors.ControlText : SystemColors.HotTrack;
+
                 bool messageCanBeChanged = _useFormCommitMessage && CommitKind is (CommitKind.Normal or CommitKind.Amend);
                 Message.Enabled = messageCanBeChanged;
                 commitMessageToolStripMenuItem.Enabled = messageCanBeChanged;
                 commitTemplatesToolStripMenuItem.Enabled = messageCanBeChanged;
+                Message.EvaluateForecolor();
             }
         }
 
@@ -348,6 +351,10 @@ public FormCommit(IGitUICommands commands, CommitKind commitKind = CommitKind.No
 
             toolStripStatusBranchIcon.AdaptImageLightness();
 
+            // Change the link color
+            commitAuthorStatus.LinkColor = Application.IsDarkModeEnabled ? Color.CornflowerBlue : Color.FromArgb(0, 0, 0xff);
+            remoteNameLabel.LinkColor = Application.IsDarkModeEnabled ? Color.CornflowerBlue : Color.Blue;
+
             splitLeft.Panel1.BackColor = OtherColors.PanelBorderColor;
             splitLeft.Panel2.BackColor = OtherColors.PanelBorderColor;
             splitRight.Panel1.BackColor = OtherColors.PanelBorderColor;
 
@@ -195,7 +195,7 @@ private void EnableButtons()
                 AcceptButton = btnSolveConflicts;
                 btnSolveConflicts.Focus();
                 btnSolveConflicts.Text = _solveConflictsText2.Text;
-                MergeToolPanel.BackColor = Color.Yellow.AdaptBackColor();
+                MergeToolPanel.BackColor = Application.IsDarkModeEnabled ? Color.FromArgb(136, 136, 0) : Color.Yellow.AdaptBackColor();
             }
             else if (Module.InTheMiddleOfRebase())
             {
 
@@ -7,7 +7,6 @@
 using GitCommands.Utils;
 using GitExtUtils;
 using GitExtUtils.GitUI;
-using GitExtUtils.GitUI.Theming;
 using GitUI.ScriptsEngine;
 using Microsoft;
 using ResourceManager;
@@ -177,7 +176,7 @@ public override void OnPageShown()
                 {
                     if (icon.Value is Bitmap bitmap)
                     {
-                        EmbeddedIcons.Images.Add(icon.Key.ToString()!, bitmap.AdaptLightness());
+                        EmbeddedIcons.Images.Add(icon.Key.ToString()!, bitmap);
                     }
                 }
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public static void FixVisualStyle(this Control container)`
`21`	`21`	`return;`
`22`	`22`	`}`
`23`	`23`
`24`		`- container.DescendantsToFix<GroupBox>()`
`25`		`- .ForEach(SetupGroupBox);`
	`24`	`+ container.DescendantsToFix<DataGridView>()`
	`25`	`+ .ForEach(SetupDataGridView);`
`26`	`26`	`container.DescendantsToFix<TreeView>()`
`27`	`27`	`.ForEach(SetupTreeView);`
`28`	`28`	`container.DescendantsToFix<TabControl>()`
`@@ -33,6 +33,8 @@ public static void FixVisualStyle(this Control container)`
`33`	`33`	`.ForEach(SetupLinkLabel);`
`34`	`34`	`container.DescendantsToFix<ToolStrip>()`
`35`	`35`	`.ForEach(SetupToolStrip);`
	`36`	`+ container.DescendantsToFix<Button>()`
	`37`	`+ .ForEach(SetupButton);`
`36`	`38`	`container.ContextMenusToFix()`
`37`	`39`	`.ForEach(SetupContextMenu);`
`38`	`40`	`}`
`@@ -81,9 +83,15 @@ private static void SetupLinkLabel(this LinkLabel label)`
`81`	`83`	`label.ActiveLinkColor = label.ActiveLinkColor.AdaptTextColor();`
`82`	`84`	`}`
`83`	`85`
`84`		`- private static void SetupGroupBox(this GroupBox box)`
	`86`	`+ private static void SetupButton(this Button button)`
`85`	`87`	`{`
`86`		`- box.TouchForeColor();`
	`88`	`+ // .net9 fix for https://github.com/dotnet/winforms/issues/11949 (only supposed to occur for 100%)`
	`89`	`+ if (Application.IsDarkModeEnabled && button.FlatStyle == FlatStyle.Standard)`
	`90`	`+ {`
	`91`	`+ // In addition to not setting the BackColor (TouchBackColor() will fix),`
	`92`	`+ // FlatStyle.Standard buttons look ugly in dark mode`
	`93`	`+ button.FlatStyle = FlatStyle.Flat;`
	`94`	`+ }`
`87`	`95`	`}`
`88`	`96`
`89`	`97`	`private static void SetupTabControl(TabControl tabControl)`
`@@ -101,6 +109,12 @@ private static void SetupTabPage(TabPage page)`
`101`	`109`	`}`
`102`	`110`	`}`
`103`	`111`
	`112`	`+ private static void SetupDataGridView(DataGridView view)`
	`113`	`+ {`
	`114`	`+ view.EnableHeadersVisualStyles = false;`
	`115`	`+ view.ColumnHeadersDefaultCellStyle.BackColor = view.ColumnHeadersDefaultCellStyle.BackColor;`
	`116`	`+ }`
	`117`	`+`
`104`	`118`	`private static void SetupTreeView(TreeView view)`
`105`	`119`	`{`
`106`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ private void EnableButtons()`
`195`	`195`	`AcceptButton = btnSolveConflicts;`
`196`	`196`	`btnSolveConflicts.Focus();`
`197`	`197`	`btnSolveConflicts.Text = _solveConflictsText2.Text;`
`198`		`- MergeToolPanel.BackColor = Color.Yellow.AdaptBackColor();`
	`198`	`+ MergeToolPanel.BackColor = Application.IsDarkModeEnabled ? Color.FromArgb(136, 136, 0) : Color.Yellow.AdaptBackColor();`
`199`	`199`	`}`
`200`	`200`	`else if (Module.InTheMiddleOfRebase())`
`201`	`201`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using GitCommands.Utils;`
`8`	`8`	`using GitExtUtils;`
`9`	`9`	`using GitExtUtils.GitUI;`
`10`		`-using GitExtUtils.GitUI.Theming;`
`11`	`10`	`using GitUI.ScriptsEngine;`
`12`	`11`	`using Microsoft;`
`13`	`12`	`using ResourceManager;`
`@@ -177,7 +176,7 @@ public override void OnPageShown()`
`177`	`176`	`{`
`178`	`177`	`if (icon.Value is Bitmap bitmap)`
`179`	`178`	`{`
`180`		`- EmbeddedIcons.Images.Add(icon.Key.ToString()!, bitmap.AdaptLightness());`
	`179`	`+ EmbeddedIcons.Images.Add(icon.Key.ToString()!, bitmap);`
`181`	`180`	`}`
`182`	`181`	`}`
`183`	`182`