Version 3.13.4.0

Author: jonaskohl

CapsLockIndicatorV3/BetterCheckBox.cs

@@ -63,7 +63,7 @@ protected override void OnPaint(PaintEventArgs e)
             }
             else
             {
-
+                var scaling = DPIHelper.GetScalingFactorPercent();
                 var border = N_Border;
                 var background = N_Background;
                 var check = N_Check;
@@ -89,14 +89,14 @@ protected override void OnPaint(PaintEventArgs e)
                     check = H_Check;
                 }
 
-                const int boxSize = 13;
-                const int boxRectInnerMargin = 2;
-                const int checkPenWidth = 2;
-                const int textMargin = 3;
+                int boxSize = (int)(13 * scaling);
+                int boxRectInnerMargin = (int)(2 * scaling);
+                int checkPenWidth = (int)(2 * scaling);
+                int textMargin = (int)(3 * scaling);
 
                 var boxY = Height / 2 - boxSize / 2;
 
-                var boxRect = new Rectangle(0, boxY, 13, 13);
+                var boxRect = new Rectangle(0, boxY, boxSize, boxSize);
                 var boxRectPen = boxRect;
                 var boxRectInner = boxRect;
                 --boxRectPen.Width;

CapsLockIndicatorV3/BetterTabControl.cs

@@ -217,7 +217,7 @@ internal void DrawControl(Graphics g)
 
         internal void DrawTab(Graphics g, TabPage tabPage, int nIndex)
         {
-            var tr = this.GetTabRect(nIndex);
+            var tr = GetTabRectDPI(nIndex);
             Rectangle recBounds = tr;
             recBounds.Y -= 2;
             recBounds.Height += 2;
@@ -329,6 +329,21 @@ internal void DrawTab(Graphics g, TabPage tabPage, int nIndex)
             }
         }
 
+        private Rectangle GetTabRectDPI(int nIndex)
+        {
+            var rect = GetTabRect(nIndex);
+            /*
+            var scale = DPIHelper.GetScalingFactorPercent();
+            rect = new Rectangle(
+                (int)(rect.X * scale),
+                (int)(rect.Y * scale),
+                (int)(rect.Width * scale),
+                (int)(rect.Height * scale)
+            );
+            */
+            return rect;
+        }
+
         internal void DrawIcons(Graphics g)
         {
             if (!_darkMode)
@@ -368,7 +383,7 @@ internal void DrawIcons(Graphics g)
             {
                 if (this.TabCount > 0)
                 {
-                    Rectangle r3 = this.GetTabRect(0);
+                    Rectangle r3 = GetTabRectDPI(0);
                     if (r3.Left < TabControlArea.Left)
                         g.DrawImage(img, r1);
                     else
@@ -385,7 +400,7 @@ internal void DrawIcons(Graphics g)
             {
                 if (this.TabCount > 0)
                 {
-                    Rectangle r3 = this.GetTabRect(this.TabCount - 1);
+                    Rectangle r3 = GetTabRectDPI(this.TabCount - 1);
                     if (r3.Right > (TabControlArea.Width - r0.Width))
                         g.DrawImage(img, r2);
                     else
@@ -439,7 +454,7 @@ protected override void OnMouseMove(MouseEventArgs e)
             var index = -1;
             for (var i = 0; i < TabCount; ++i)
             {
-                var rect = GetTabRect(i);
+                var rect = GetTabRectDPI(i);
                 if (rect.Contains(pos))
                 {
                     index = i;

CapsLockIndicatorV3/CapsLockIndicatorV3.csproj

@@ -114,6 +114,7 @@
     <Compile Include="DownloadDialog.Designer.cs">
       <DependentUpon>DownloadDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="DPIHelper.cs" />
     <Compile Include="DropDownLocale.cs" />
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="FirstRunDialog.cs">

CapsLockIndicatorV3/DPIHelper.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapsLockIndicatorV3
+{
+    internal static class DPIHelper
+    {
+        [DllImport("gdi32.dll")]
+        static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+        private enum DeviceCap
+        {
+            VERTRES = 10,
+            LOGPIXELSY = 90,
+            DESKTOPVERTRES = 117
+        }
+
+        internal static decimal GetScalingFactorPercent()
+        {
+            var g = Graphics.FromHwnd(IntPtr.Zero);
+            try
+            {
+                var desktop = g.GetHdc();
+                var LogicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES);
+                var PhysicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES);
+                var logpixelsy = GetDeviceCaps(desktop, (int)DeviceCap.LOGPIXELSY);
+                var screenScalingFactor = PhysicalScreenHeight / (decimal)LogicalScreenHeight;
+                var dpiScalingFactor = logpixelsy / 96.0M;
+
+                return dpiScalingFactor;
+            }
+            finally
+            {
+                g?.ReleaseHdc();
+            }
+        }
+    }
+}

CapsLockIndicatorV3/IconPackBrowser.Designer.cs

@@ -244,7 +244,7 @@ private void IconPackBrowser_DarkModeChanged(object sender, EventArgs e)
 
             ControlScheduleSetDarkMode(webBrowser1, dark);
 
-            webBrowser1.Navigate("https://cli.jonaskohl.de/icongallery/embedded.php?dark=" + (dark ? "true" : "false"));
+            webBrowser1.Navigate("https://cli.jonaskohl.de/icongallery/embedded.php?dark=" + (dark ? "true" : "false") + "&scale=" + ((int)(DPIHelper.GetScalingFactorPercent() * 100)).ToString());
         }
     }
 }