Merge pull request #2255 from GabeMx5/master

bugfix #2254
arkypita · May 23, 2024 · c5795f6 · c5795f6
2 parents 57c4580 + 29fc62e
commit c5795f6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/LaserGRBL/AssemblyInfo.cs b/LaserGRBL/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build 
 // utilizzando l'asterisco (*) come descritto di seguito:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("6.9.9")]
+[assembly: AssemblyVersion ("6.9.10")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/LaserGRBL/UserControls/ImageButton.cs b/LaserGRBL/UserControls/ImageButton.cs
@@ -12,6 +12,7 @@
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace LaserGRBL.UserControls
 {
@@ -212,34 +213,39 @@ protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
                 else
                 {
                     float direction = ColorScheme.DarkScheme ? 1 : -1;
-                    Color borderColor = (Tmp.Tag as LoadedImageTag).Color;
-                    if (DrawDisabled())
-                    {
-                        Tmp = Base.Drawing.ImageTransform.SetColor(Tmp, ColorScheme.DisabledButtons);
-                        borderColor = ColorScheme.DisabledButtons;
-                    }
-                    else
+                    Color borderColor = ColorScheme.ControlsBorder;
+                    if (Tmp != null)
                     {
-                        if (IsMouseInside())
+                        LoadedImageTag tag = Tmp.Tag as LoadedImageTag;
+                        borderColor = tag?.Color ?? ColorScheme.ControlsBorder;
+                        if (DrawDisabled())
+                        {
+                            Tmp = Base.Drawing.ImageTransform.SetColor(Tmp, ColorScheme.DisabledButtons);
+                            borderColor = ColorScheme.DisabledButtons;
+                        }
+                        else
                         {
-                            if (MouseButtons == MouseButtons.Left)
+                            if (IsMouseInside())
                             {
-                                borderColor = ColorScheme.ChangeColorBrightness(borderColor, 0.3F * direction);
-                                Tmp = Base.Drawing.ImageTransform.Brightness(Tmp, 0.3F * direction);
-                                Point = new Point(Point.X + CLICK_SCALE_IN_PIXEL, CLICK_SCALE_IN_PIXEL);
-                                Size.Width -= CLICK_SCALE_IN_PIXEL * 2;
-                                Size.Height -= CLICK_SCALE_IN_PIXEL * 2;
+                                if (MouseButtons == MouseButtons.Left)
+                                {
+                                    borderColor = ColorScheme.ChangeColorBrightness(borderColor, 0.3F * direction);
+                                    Tmp = Base.Drawing.ImageTransform.Brightness(Tmp, 0.3F * direction);
+                                    Point = new Point(Point.X + CLICK_SCALE_IN_PIXEL, CLICK_SCALE_IN_PIXEL);
+                                    Size.Width -= CLICK_SCALE_IN_PIXEL * 2;
+                                    Size.Height -= CLICK_SCALE_IN_PIXEL * 2;
+                                }
+                                else
+                                {
+                                    borderColor = ColorScheme.ChangeColorBrightness(borderColor, 0.2F * direction);
+                                    Tmp = Base.Drawing.ImageTransform.Brightness(Tmp, 0.2F * direction);
+                                }
                             }
                             else
                             {
-                                borderColor = ColorScheme.ChangeColorBrightness(borderColor, 0.2F * direction);
-                                Tmp = Base.Drawing.ImageTransform.Brightness(Tmp, 0.2F * direction);
+                                //Tmp = Base.Drawing.ImageTransform.Brightness(Tmp, 0);
                             }
                         }
-                        else
-                        {
-                            //Tmp = Base.Drawing.ImageTransform.Brightness(Tmp, 0);
-                        }
                     }
 
                     e.Graphics.Clear(ColorScheme.FormBackColor);