Merge branch 'main' of https://github.com/radj307/volume-control

# Conflicts: # UIComposites/HotkeyEditor.Designer.cs
radj307 · Feb 21, 2022 · 5d60341 · 5d60341
2 parents 72a176a + e239aba
commit 5d60341
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 23 deletions.
diff --git a/UIComposites/ColorScheme.cs b/UIComposites/ColorScheme.cs
@@ -111,15 +111,18 @@ public ColorScheme(DefaultColorBinding defaultColors, List<IColorBinding> colors
         {
             Theme = colors;
             Default = defaultColors;
+            BorderHighlight = new();
         }
         public ColorScheme()
         {
             Theme = new();
             Default = new();
+            BorderHighlight = new();
         }
 
         public List<IColorBinding> Theme;
         public DefaultColorBinding Default;
+        public DefaultColorBinding BorderHighlight;
 
         private IColorBinding GetApplicableColor(Control type)
         {

diff --git a/UIComposites/ColorSchemes.cs b/UIComposites/ColorSchemes.cs
@@ -7,6 +7,7 @@ public partial class ColorScheme
         public static readonly ColorScheme LightMode = new()
         {
             Default = new(Color.Black, Color.WhiteSmoke),
+            BorderHighlight = new(Color.Black, Color.WhiteSmoke),
             Theme = new()
             {
                 new ColorBinding<Panel>(Color.Transparent, Color.WhiteSmoke),
@@ -21,14 +22,15 @@ public partial class ColorScheme
         };
         public static readonly ColorScheme DarkMode = new()
         {
-            Default = new(Color.WhiteSmoke, Color.FromArgb(75, 75, 75)),
+            Default = new(Color.WhiteSmoke, Color.FromArgb(50, 50, 50)),
+            BorderHighlight = new(Color.WhiteSmoke, Color.Magenta),
             Theme = new()
             {
                 new ColorBinding<Panel>(Color.Transparent, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<GroupBox>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<Label>(Color.WhiteSmoke, Color.Transparent),
                 new ColorBinding<CheckBox>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
-                new ColorBinding<ComboBox>(Color.WhiteSmoke, Color.FromArgb(75, 75, 75)),
+                new ColorBinding<ComboBox>(Color.WhiteSmoke, Color.FromArgb(50, 50, 50)),
                 new ColorBinding<NumericUpDown>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<UserControl>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<Tab>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60))

diff --git a/UIComposites/HotkeyEditor.Designer.cs b/UIComposites/HotkeyEditor.Designer.cs
diff --git a/UIComposites/SettingsPane.Designer.cs b/UIComposites/SettingsPane.Designer.cs