Version 3.15.0.0

jonaskohl · Nov 21, 2021 · f92c2b7 · f92c2b7
1 parent 4128235
commit f92c2b7
Show file tree

Hide file tree

Showing 33 changed files with 1,801 additions and 629 deletions.
diff --git a/CapsLockIndicatorV3/AdvancedSettings.Designer.cs b/CapsLockIndicatorV3/AdvancedSettings.Designer.cs
diff --git a/CapsLockIndicatorV3/AdvancedSettings.cs b/CapsLockIndicatorV3/AdvancedSettings.cs
@@ -50,6 +50,12 @@ public AdvancedSettings()
             }
 
             pictureBox1.Image = IconExtractor.GetIcon("imageres.dll", 79, 48)?.ToBitmap();
+
+            Text = strings.advancedSettingsTitle;
+            label2.Text = strings.headerWarning;
+            label3.Text = strings.advancedSettingsWarning;
+            checkBox1.Text = strings.advancedSettingsConfirmation;
+            button1.Text = strings.ok;
         }
 
         private void ListView1_ItemActivate(object sender, EventArgs e)

diff --git a/CapsLockIndicatorV3/AdvancedSettings.resx b/CapsLockIndicatorV3/AdvancedSettings.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Changing advanced settings may cause unexpected behaviour and may lead to an unstable state of CapsLock Indicator. Please restart CapsLock Indicator after changing settings. Only change settings if you know what you are doing! Use this editor at your own risk!</value>
-  </data>
   <metadata name="contextMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

diff --git a/CapsLockIndicatorV3/BetterCheckBox.cs b/CapsLockIndicatorV3/BetterCheckBox.cs
@@ -25,9 +25,21 @@ public bool DarkMode
             }
         }
 
-        const int STARTX = 16;
+        const int STARTX = 13;
+        int StartX => (int)(DPIHelper.GetScalingFactorPercent(Handle) * STARTX);
         const int STARTY = 1;
 
+        private TextFormatFlags TextRenderingFlags
+        {
+            get
+            {
+                var flags = TextFormatFlags.Left | TextFormatFlags.VerticalCenter | TextFormatFlags.WordBreak;
+                if (!ShowKeyboardCues)
+                    flags |= TextFormatFlags.HidePrefix;
+                return flags;
+            }
+        }
+
         private static readonly Color N_Border = Color.FromArgb(137, 137, 137);
         private static readonly Color N_Background = Color.FromArgb(0, 0, 0);
         private static readonly Color N_Check = Color.FromArgb(222, 222, 222);
@@ -68,11 +80,12 @@ protected override void OnPaint(PaintEventArgs e)
 
                 if (!Enabled && FlatStyle != FlatStyle.System)
                 {
-                    e.Graphics.SetClip(new Rectangle(STARTX, 0, Width - STARTX, Height));
+                    var bounds = new Rectangle(StartX, 0, Width - StartX, Height);
+                    e.Graphics.SetClip(bounds);
                     e.Graphics.Clear(bgColor);
                     e.Graphics.ResetClip();
                     // Use legacy "DrawText" to make it look exactly the same as default
-                    TextRenderer.DrawText(e.Graphics, Text, Font, new Point(STARTX, STARTY), ForeColor.Blend(bgColor, 0.5d));
+                    TextRenderer.DrawText(e.Graphics, base.Text, base.Font, bounds, base.ForeColor.Blend(bgColor, 0.5d), TextRenderingFlags);
                 }
             }
             else
@@ -153,7 +166,7 @@ protected override void OnPaint(PaintEventArgs e)
                 var textY = Height / 2 - textSz.Height / 2;
                 var textPt = new Point(boxSize + textMargin, textY);
 
-                TextRenderer.DrawText(e.Graphics, Text, Font, textPt, fg);
+                TextRenderer.DrawText(e.Graphics, Text, Font, new Rectangle(StartX, 0, Width - StartX, Height), fg, TextRenderingFlags);
 
                 var focusRect = new Rectangle(textPt, textSz);