From be7a104d9d2d0e8d608677acdb59f9b02ddfb55f Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 20 May 2020 06:26:46 +0300
Subject: [PATCH] Support theme opacity in quick task menu

---
 ShareX.HelpersLib/NameParser/CodeMenu.cs             | 11 +++++------
 ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs |  2 +-
 ShareX/QuickTaskMenu.cs                              | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ShareX.HelpersLib/NameParser/CodeMenu.cs b/ShareX.HelpersLib/NameParser/CodeMenu.cs
index 6fce0cbcf..db60fc059 100644
--- a/ShareX.HelpersLib/NameParser/CodeMenu.cs
+++ b/ShareX.HelpersLib/NameParser/CodeMenu.cs
@@ -58,12 +58,6 @@ public CodeMenu(TextBoxBase tbb, CodeMenuItem[] items)
             AutoClose = textBoxBase == null;
             ShowImageMargin = false;
 
-            if (ShareXResources.ExperimentalCustomTheme)
-            {
-                Opacity = ShareXResources.Theme.ContextMenuOpacityDouble;
-                Renderer = new ToolStripDarkRenderer();
-            }
-
             foreach (CodeMenuItem item in items)
             {
                 ToolStripMenuItem tsmi = new ToolStripMenuItem { Text = $"{item.Name} - {item.Description}", Tag = item.Name };
@@ -109,6 +103,11 @@ public CodeMenu(TextBoxBase tbb, CodeMenuItem[] items)
             tsmiClose.Click += (sender, e) => Close();
             Items.Add(tsmiClose);
 
+            if (ShareXResources.ExperimentalCustomTheme)
+            {
+                ShareXResources.ApplyCustomThemeToContextMenuStrip(this);
+            }
+
             if (textBoxBase != null)
             {
                 textBoxBase.MouseDown += (sender, e) =>
diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
index db86050c0..1b65d1516 100644
--- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
+++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
@@ -327,7 +327,7 @@ private void UpdateInputBox()
 
         private void UpdateButtonImages()
         {
-            if (ShareXResources.UseCustomTheme)
+            if (ShareXResources.ExperimentalCustomTheme)
             {
                 ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsGradient);
                 ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsAlignmentHorizontal);
diff --git a/ShareX/QuickTaskMenu.cs b/ShareX/QuickTaskMenu.cs
index 0540f7a17..193363dcb 100644
--- a/ShareX/QuickTaskMenu.cs
+++ b/ShareX/QuickTaskMenu.cs
@@ -43,11 +43,6 @@ public void ShowMenu()
                 AutoClose = false
             };
 
-            if (ShareXResources.ExperimentalCustomTheme)
-            {
-                cms.Renderer = new ToolStripDarkRenderer();
-            }
-
             cms.KeyUp += (sender, e) =>
             {
                 if (e.KeyCode == Keys.Escape)
@@ -110,6 +105,11 @@ public void ShowMenu()
             tsmiCancel.Click += (sender, e) => cms.Close();
             cms.Items.Add(tsmiCancel);
 
+            if (ShareXResources.UseCustomTheme)
+            {
+                ShareXResources.ApplyCustomThemeToContextMenuStrip(cms);
+            }
+
             Point cursorPosition = CaptureHelpers.GetCursorPosition();
             cursorPosition.Offset(-10, -10);
             cms.Show(cursorPosition);