Merge pull request #49 from tomaz82/fixes

Author: JockeJarre

Changelog.txt

@@ -19,6 +19,8 @@
 - Fix the Location and Size not updating in the Illumination window when right clicking and selecting a bulb.
 - Change default zoom to "window"
 - Fix zoom combo box to change it values when zoom is changed with mouse wheel.
+- Fix TrimImage wrongfully checking blue channel instead of alpha channel.
+- Fix ID numbers showing when previewing reels.
 
 2.1.0
 - Increased Max ZOrder to 19 from 9 by jonesyUK

b2sbackglassdesigner/b2sbackglassdesigner/Modules/moduleB2S.vb

@@ -351,23 +351,18 @@ Module moduleB2S
         Dim bottom As Integer = 0
         For y As Integer = 0 To (imageData.Height - 1)
             For x As Integer = 0 To (imageData.Width - 1)
-                Dim isNotTransparent As Boolean = imageARGB((((y * imageData.Width) + x) * 4) + 0) > 0
+                Dim isNotTransparent As Boolean = imageARGB((((y * imageData.Width) + x) * 4) + 3) > 0
                 If isNotTransparent Then
-                    If left > x Then
-                        left = x
-                    End If
-                    If right < x Then
-                        right = x
-                    End If
-                    If top > y Then
-                        top = y
-                    End If
-                    If bottom < y Then
-                        bottom = y
-                    End If
+                    If left > x Then left = x
+                    If right < x Then right = x
+                    If top > y Then top = y
+                    If bottom < y Then bottom = y
                 End If
             Next
         Next
+        If left > right Or top > bottom Then
+            Return Rectangle.Empty ' Fully transparent
+        End If
         Return New Rectangle(left, top, right - left + 1, bottom - top + 1)
     End Function
 

b2sbackglassdesigner/b2sbackglassdesigner/classes/PictureBox/B2SPictureBox.vb

@@ -256,11 +256,11 @@ Public Class B2SPictureBox
                         End If
                     End If
                     ' maybe draw start digit
-                    If .ReelIlluB2SID > 0 Then
+                    If ShowScoreFrames AndAlso .ReelIlluB2SID > 0 Then
                         TextRenderer.DrawText(pe.Graphics, .ReelIlluB2SID.ToString() & If(.ReelIlluB2SValue > 0, "/" & .ReelIlluB2SValue.ToString(), ""), font, New Rectangle(rect.X + 3, rect.Y + rect.Height - 15, 80, 15), framecolor, Color.White, TextFormatFlags.VerticalCenter Or TextFormatFlags.Left Or TextFormatFlags.NoPrefix)
                     End If
                     ' maybe draw reel illumination info
-                    If .B2SStartDigit > 0 Then
+                    If ShowScoreFrames AndAlso .B2SStartDigit > 0 Then
                         Dim toleft As Integer = If(.Equals(Mouse.SelectedScore), 13, 0) 'If(.Equals(Mouse.SelectedBulb), If(isSmallRect, -1, 13), 0)
                         TextRenderer.DrawText(pe.Graphics, If(.B2SPlayerNo <> eB2SPlayerNo.NotUsed, "P" & CInt(.B2SPlayerNo).ToString() & "/", "") & .B2SStartDigit.ToString(), font, New Rectangle(rect.X + rect.Width - 50, rect.Y + 3, 47 - toleft, 15), framecolor, Color.White, TextFormatFlags.VerticalCenter Or TextFormatFlags.Right Or TextFormatFlags.NoPrefix)
                     End If