From a42ea8d0f3e1c8a84fcb98042900568f5582f7d0 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 12 Jun 2023 09:40:08 +0200 Subject: [PATCH 1/2] fix logical operator in HightlightPanel.GetColor --- Pilz.UI/HighlightPanel.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Pilz.UI/HighlightPanel.vb b/Pilz.UI/HighlightPanel.vb index 9eb7028..a50ef3d 100644 --- a/Pilz.UI/HighlightPanel.vb +++ b/Pilz.UI/HighlightPanel.vb @@ -160,7 +160,7 @@ Friend Class HighlightPanel If rgb = -1 Then Return Color.Empty Else - Return Color.FromArgb((rgb And &HFF0000) >> 16, (rgb And &HFF00) >> 8, rgb & &HFF) + Return Color.FromArgb((rgb And &HFF0000) >> 16, (rgb And &HFF00) >> 8, rgb And &HFF) End If End Function @@ -168,7 +168,7 @@ Friend Class HighlightPanel If rgb = -1 Then Return Color.Empty Else - Return Color.FromArgb(alpha, (rgb And &HFF0000) >> 16, (rgb And &HFF00) >> 8, rgb & &HFF) + Return Color.FromArgb(alpha, (rgb And &HFF0000) >> 16, (rgb And &HFF00) >> 8, rgb And &HFF) End If End Function From ef85aea1c5b7602535bd712279a2cfe82b40bc88 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 12 Jun 2023 09:48:34 +0200 Subject: [PATCH 2/2] fix highlight color --- Pilz.UI/HighlightPanel.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Pilz.UI/HighlightPanel.vb b/Pilz.UI/HighlightPanel.vb index a50ef3d..eb2a4bf 100644 --- a/Pilz.UI/HighlightPanel.vb +++ b/Pilz.UI/HighlightPanel.vb @@ -220,9 +220,9 @@ Friend Class HighlightPanel Public HighlightColor As eHighlightColor Public Sub New(ByVal bounds As Rectangle, ByVal backColor As Color, ByVal highlightColor As eHighlightColor) - bounds = bounds - backColor = backColor - highlightColor = highlightColor + Me.Bounds = bounds + Me.BackColor = backColor + Me.HighlightColor = highlightColor End Sub End Structure