Scale images in context menu, fixed #22

maxim-zhao · Nov 15, 2018 · 294f006 · 294f006
1 parent 3c8d86a
commit 294f006
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 146 deletions.
diff --git a/SidWiz/HighDpiHelper.cs b/SidWiz/HighDpiHelper.cs
@@ -51,20 +51,31 @@ private static void AdjustControlImagesDpiScale(IEnumerable controls, float dpiS
                 }
                 else if (control is ToolStrip toolStrip)
                 {
-                    toolStrip.ImageScalingSize = ScaleSize(toolStrip.ImageScalingSize, dpiScale);
-                    foreach (var item in toolStrip.Items.Cast<ToolStripItem>().Where(i => i.Image != null))
-                    {
-                        item.Image = ScaleImage(item.Image, dpiScale);
-                    }
+                    ScaleToolStrip(dpiScale, toolStrip);
 
                     toolStrip.AutoSize = true;
                 }
 
+                if (control.ContextMenuStrip != null)
+                {
+                    ScaleToolStrip(dpiScale, control.ContextMenuStrip);
+                }
+
+
                 // Then recurse
                 AdjustControlImagesDpiScale(control.Controls, dpiScale);
             }
         }
 
+        private static void ScaleToolStrip(float dpiScale, ToolStrip toolStrip)
+        {
+            toolStrip.ImageScalingSize = ScaleSize(toolStrip.ImageScalingSize, dpiScale);
+            foreach (var item in toolStrip.Items.Cast<ToolStripItem>().Where(i => i.Image != null))
+            {
+                item.Image = ScaleImage(item.Image, dpiScale);
+            }
+        }
+
         private static bool CloseToOne(float dpiScale)
         {
             return Math.Abs(dpiScale - 1) < 0.001;

diff --git a/SidWiz/SidWizPlusGUI.Designer.cs b/SidWiz/SidWizPlusGUI.Designer.cs