From ee0ffd3eef732cda104ee4107b54cec82e7cbf2c Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 11 Sep 2019 19:25:11 +0300 Subject: [PATCH] Rename BackgroundColor2 to LightBackgroundColor, added DarkBackgroundColor for thumbnail back color, merge MenuButtonCheckedColor to MenuCheckBackgroundColor --- ShareX.HelpersLib/Controls/DarkColorTable.cs | 8 ++++---- ShareX.HelpersLib/ShareXResources.cs | 20 ++++++++++---------- ShareX.HelpersLib/ShareXTheme.cs | 20 ++++++++++---------- ShareX.HistoryLib/Forms/ImageHistoryForm.cs | 2 +- ShareX/Controls/TaskThumbnailPanel.cs | 4 ++-- ShareX/Forms/MainForm.cs | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ShareX.HelpersLib/Controls/DarkColorTable.cs b/ShareX.HelpersLib/Controls/DarkColorTable.cs index 3dfbe9515..8fff6a593 100644 --- a/ShareX.HelpersLib/Controls/DarkColorTable.cs +++ b/ShareX.HelpersLib/Controls/DarkColorTable.cs @@ -48,7 +48,7 @@ public override Color ButtonPressedHighlightBorder } public override Color ButtonCheckedHighlight { - get { return ShareXResources.Theme.MenuButtonCheckedColor; } + get { return ShareXResources.Theme.MenuCheckBackgroundColor; } } public override Color ButtonCheckedHighlightBorder { @@ -64,15 +64,15 @@ public override Color ButtonSelectedBorder } public override Color ButtonCheckedGradientBegin { - get { return ShareXResources.Theme.MenuButtonCheckedColor; } + get { return ShareXResources.Theme.MenuCheckBackgroundColor; } } public override Color ButtonCheckedGradientMiddle { - get { return ShareXResources.Theme.MenuButtonCheckedColor; } + get { return ShareXResources.Theme.MenuCheckBackgroundColor; } } public override Color ButtonCheckedGradientEnd { - get { return ShareXResources.Theme.MenuButtonCheckedColor; } + get { return ShareXResources.Theme.MenuCheckBackgroundColor; } } public override Color ButtonSelectedGradientBegin { diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs index 8742ae665..de9dd72fc 100644 --- a/ShareX.HelpersLib/ShareXResources.cs +++ b/ShareX.HelpersLib/ShareXResources.cs @@ -117,31 +117,31 @@ private static void ApplyDarkThemeToControl(Control control) btn.FlatStyle = FlatStyle.Flat; btn.FlatAppearance.BorderColor = Theme.BorderColor; btn.ForeColor = Theme.TextColor; - btn.BackColor = Theme.BackgroundColor2; + btn.BackColor = Theme.LightBackgroundColor; return; case CheckBox cb when cb.Appearance == Appearance.Button: cb.FlatStyle = FlatStyle.Flat; cb.FlatAppearance.BorderColor = Theme.BorderColor; cb.ForeColor = Theme.TextColor; - cb.BackColor = Theme.BackgroundColor2; + cb.BackColor = Theme.LightBackgroundColor; return; case TextBox tb: tb.ForeColor = Theme.TextColor; - tb.BackColor = Theme.BackgroundColor2; + tb.BackColor = Theme.LightBackgroundColor; tb.BorderStyle = BorderStyle.FixedSingle; return; case ComboBox cb: cb.FlatStyle = FlatStyle.Flat; cb.ForeColor = Theme.TextColor; - cb.BackColor = Theme.BackgroundColor2; + cb.BackColor = Theme.LightBackgroundColor; return; case ListBox lb: lb.ForeColor = Theme.TextColor; - lb.BackColor = Theme.BackgroundColor2; + lb.BackColor = Theme.LightBackgroundColor; return; case ListView lv: lv.ForeColor = Theme.TextColor; - lv.BackColor = Theme.BackgroundColor2; + lv.BackColor = Theme.LightBackgroundColor; lv.SupportDarkTheme(); return; case SplitContainer sc: @@ -155,17 +155,17 @@ private static void ApplyDarkThemeToControl(Control control) pg.SelectedItemWithFocusForeColor = Theme.BackgroundColor; pg.SelectedItemWithFocusBackColor = Theme.TextColor; pg.ViewForeColor = Theme.TextColor; - pg.ViewBackColor = Theme.BackgroundColor2; + pg.ViewBackColor = Theme.LightBackgroundColor; pg.ViewBorderColor = Theme.BorderColor; pg.HelpForeColor = Theme.TextColor; pg.HelpBackColor = Theme.BackgroundColor; pg.HelpBorderColor = Theme.BorderColor; return; case DataGridView dgv: - dgv.BackgroundColor = Theme.BackgroundColor2; + dgv.BackgroundColor = Theme.LightBackgroundColor; dgv.GridColor = Theme.BorderColor; - dgv.DefaultCellStyle.BackColor = Theme.BackgroundColor2; - dgv.DefaultCellStyle.SelectionBackColor = Theme.BackgroundColor2; + dgv.DefaultCellStyle.BackColor = Theme.LightBackgroundColor; + dgv.DefaultCellStyle.SelectionBackColor = Theme.LightBackgroundColor; dgv.DefaultCellStyle.ForeColor = Theme.TextColor; dgv.DefaultCellStyle.SelectionForeColor = Theme.TextColor; dgv.ColumnHeadersDefaultCellStyle.BackColor = Theme.BackgroundColor; diff --git a/ShareX.HelpersLib/ShareXTheme.cs b/ShareX.HelpersLib/ShareXTheme.cs index 273992e78..7e0c0e90c 100644 --- a/ShareX.HelpersLib/ShareXTheme.cs +++ b/ShareX.HelpersLib/ShareXTheme.cs @@ -38,7 +38,10 @@ public class ShareXTheme public Color BackgroundColor { get; set; } [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] - public Color BackgroundColor2 { get; set; } + public Color LightBackgroundColor { get; set; } + + [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] + public Color DarkBackgroundColor { get; set; } [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] public Color TextColor { get; set; } @@ -66,17 +69,14 @@ public class ShareXTheme [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] public Color MenuBorderColor { get; set; } - [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] - public Color MenuButtonCheckedColor { get; set; } - [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] public Color MenuCheckBackgroundColor { get; set; } [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] - public Color SeparatorDarkColor { get; set; } + public Color SeparatorLightColor { get; set; } [Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))] - public Color SeparatorLightColor { get; set; } + public Color SeparatorDarkColor { get; set; } public ShareXTheme() { @@ -98,7 +98,8 @@ public void ApplyDarkColors() { Name = "Dark"; BackgroundColor = Color.FromArgb(42, 47, 56); - BackgroundColor2 = Color.FromArgb(52, 57, 65); + LightBackgroundColor = Color.FromArgb(52, 57, 65); + DarkBackgroundColor = Color.FromArgb(28, 32, 38); TextColor = Color.FromArgb(235, 235, 235); BorderColor = Color.FromArgb(28, 32, 38); CheckerColor = Color.FromArgb(60, 60, 60); @@ -107,10 +108,9 @@ public void ApplyDarkColors() MenuHighlightColor = Color.FromArgb(255, 30, 34, 40); MenuHighlightBorderColor = Color.FromArgb(255, 116, 129, 152); MenuBorderColor = Color.FromArgb(255, 22, 26, 31); - MenuButtonCheckedColor = Color.FromArgb(255, 56, 64, 75); - MenuCheckBackgroundColor = Color.FromArgb(255, 74, 83, 100); - SeparatorDarkColor = Color.FromArgb(255, 22, 26, 31); + MenuCheckBackgroundColor = Color.FromArgb(255, 56, 64, 75); SeparatorLightColor = Color.FromArgb(255, 56, 64, 75); + SeparatorDarkColor = Color.FromArgb(255, 22, 26, 31); } public override string ToString() diff --git a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs index d85b226b8..3d8468dfc 100644 --- a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs @@ -59,7 +59,7 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio if (ShareXResources.ExperimentalDarkTheme) { ilvImages.BorderStyle = BorderStyle.None; - ilvImages.Colors.BackColor = ShareXResources.Theme.BackgroundColor2; + ilvImages.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor; ilvImages.Colors.BorderColor = ShareXResources.Theme.BorderColor; ilvImages.Colors.ForeColor = ShareXResources.Theme.TextColor; ilvImages.Colors.SelectedForeColor = ShareXResources.Theme.TextColor; diff --git a/ShareX/Controls/TaskThumbnailPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs index b5e41f7de..466037716 100644 --- a/ShareX/Controls/TaskThumbnailPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -206,8 +206,8 @@ public void UpdateTheme() if (ShareXResources.UseDarkTheme) { lblTitle.ForeColor = ShareXResources.Theme.TextColor; - lblTitle.TextShadowColor = ShareXResources.Theme.BorderColor; - pThumbnail.PanelColor = ShareXResources.Theme.BorderColor; + lblTitle.TextShadowColor = ShareXResources.Theme.DarkBackgroundColor; + pThumbnail.PanelColor = ShareXResources.Theme.DarkBackgroundColor; ttMain.BackColor = ShareXResources.Theme.BackgroundColor; ttMain.ForeColor = ShareXResources.Theme.TextColor; } diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index b238b87d9..6db2fc7cd 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -821,7 +821,7 @@ public void UpdateTheme() flpSocialButtons.BackColor = ShareXResources.Theme.BackgroundColor; btnCloseNews.FlatAppearance.BorderColor = ShareXResources.Theme.BorderColor; btnCloseNews.ForeColor = ShareXResources.Theme.TextColor; - btnCloseNews.BackColor = ShareXResources.Theme.BackgroundColor2; + btnCloseNews.BackColor = ShareXResources.Theme.LightBackgroundColor; } else {