diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs
index d97b0904a..1b6a8a4dd 100644
--- a/ShareX.HelpersLib/ShareXResources.cs
+++ b/ShareX.HelpersLib/ShareXResources.cs
@@ -164,6 +164,13 @@ public static void ApplyCustomThemeToControl(Control control)
switch (control)
{
+ case ColorButton colorButton:
+ colorButton.FlatStyle = FlatStyle.Flat;
+ colorButton.FlatAppearance.BorderColor = Theme.BorderColor;
+ colorButton.ForeColor = Theme.TextColor;
+ colorButton.BackColor = Theme.LightBackgroundColor;
+ colorButton.BorderColor = Theme.BorderColor;
+ return;
case Button btn:
btn.FlatStyle = FlatStyle.Flat;
btn.FlatAppearance.BorderColor = Theme.BorderColor;
diff --git a/ShareX/Controls/HotkeySelectionControl.Designer.cs b/ShareX/Controls/HotkeySelectionControl.Designer.cs
index 36588e05b..67405c8cf 100644
--- a/ShareX/Controls/HotkeySelectionControl.Designer.cs
+++ b/ShareX/Controls/HotkeySelectionControl.Designer.cs
@@ -31,9 +31,9 @@ private void InitializeComponent()
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeySelectionControl));
this.btnEdit = new System.Windows.Forms.Button();
- this.btnHotkey = new ShareX.HelpersLib.ColorButton();
- this.btnTask = new ShareX.HelpersLib.MenuButton();
this.cmsTask = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.btnTask = new ShareX.HelpersLib.MenuButton();
+ this.btnHotkey = new ShareX.HelpersLib.ColorButton();
this.SuspendLayout();
//
// btnEdit
@@ -44,6 +44,20 @@ private void InitializeComponent()
this.btnEdit.UseVisualStyleBackColor = true;
this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
//
+ // cmsTask
+ //
+ this.cmsTask.Name = "cmsTask";
+ resources.ApplyResources(this.cmsTask, "cmsTask");
+ //
+ // btnTask
+ //
+ resources.ApplyResources(this.btnTask, "btnTask");
+ this.btnTask.Image = global::ShareX.Properties.Resources.gear;
+ this.btnTask.Menu = this.cmsTask;
+ this.btnTask.Name = "btnTask";
+ this.btnTask.UseMnemonic = false;
+ this.btnTask.UseVisualStyleBackColor = true;
+ //
// btnHotkey
//
resources.ApplyResources(this.btnHotkey, "btnHotkey");
@@ -59,20 +73,6 @@ private void InitializeComponent()
this.btnHotkey.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnHotkey_MouseClick);
this.btnHotkey.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.btnHotkey_PreviewKeyDown);
//
- // btnTask
- //
- resources.ApplyResources(this.btnTask, "btnTask");
- this.btnTask.Image = global::ShareX.Properties.Resources.gear;
- this.btnTask.Menu = this.cmsTask;
- this.btnTask.Name = "btnTask";
- this.btnTask.UseMnemonic = false;
- this.btnTask.UseVisualStyleBackColor = true;
- //
- // cmsTask
- //
- this.cmsTask.Name = "cmsTask";
- resources.ApplyResources(this.cmsTask, "cmsTask");
- //
// HotkeySelectionControl
//
resources.ApplyResources(this, "$this");
diff --git a/ShareX/Controls/HotkeySelectionControl.resx b/ShareX/Controls/HotkeySelectionControl.resx
index 890684f25..4739d28be 100644
--- a/ShareX/Controls/HotkeySelectionControl.resx
+++ b/ShareX/Controls/HotkeySelectionControl.resx
@@ -147,6 +147,60 @@
2
+
+ 17, 17
+
+
+ 61, 4
+
+
+ cmsTask
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Top, Left, Right
+
+
+ MiddleLeft
+
+
+ NoControl
+
+
+ 0, 0
+
+
+ 3, 0, 3, 0
+
+
+ 226, 27
+
+
+ 0
+
+
+ Task...
+
+
+ MiddleLeft
+
+
+ ImageBeforeText
+
+
+ btnTask
+
+
+ ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null
+
+
+ $this
+
+
+ 1
+
Top, Right
@@ -180,57 +234,6 @@
3
-
- Top, Left, Right
-
-
- MiddleLeft
-
-
- 0, 0
-
-
- 17, 17
-
-
- 61, 4
-
-
- cmsTask
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 3, 0, 0, 0
-
-
- 226, 27
-
-
- 3
-
-
- Task...
-
-
- MiddleLeft
-
-
- ImageBeforeText
-
-
- btnTask
-
-
- ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null
-
-
- $this
-
-
- 1
-
True
diff --git a/ShareX/Forms/HotkeySettingsForm.cs b/ShareX/Forms/HotkeySettingsForm.cs
index a5ea1d87c..c06fb4981 100644
--- a/ShareX/Forms/HotkeySettingsForm.cs
+++ b/ShareX/Forms/HotkeySettingsForm.cs
@@ -133,7 +133,7 @@ private void control_HotkeyChanged(object sender, EventArgs e)
private HotkeySelectionControl AddHotkeySelectionControl(HotkeySettings hotkeySetting)
{
HotkeySelectionControl control = new HotkeySelectionControl(hotkeySetting);
- control.Margin = new Padding(0, 0, 0, 2);
+ control.Margin = new Padding(0, 0, 0, 4);
control.SelectedChanged += control_SelectedChanged;
control.HotkeyChanged += control_HotkeyChanged;
control.EditRequested += control_EditRequested;