Merge pull request #47 from tomaz82/zoom

Fix zoom text in combobox to update when zooming with mouse wheel, an…

Author: JockeJarre

Changelog.txt

@@ -13,10 +13,12 @@
 - Remember latest Author and default to it when creating a new table.
 - Detect rom id, rom type and inverted state from the filename when importing snippit images. (S12 iL14 Gi2)
 - Remember latest import directory.
-- Added the option to right click a reel, credit reel or led set in the "Reels and LEDs" window and export or delete it.
-- Added Drag n Drop support for loading .directb2s, .b2s and .b2b projects.
-- Added Drag n Drop support for creating snippits from .png files.
-- Fixed the Location and Size not updating in the Illumination window when right clicking and selecting a bulb.
+- Add "Export" and "Delete" options when right clicking a reel, credit reel or led set in the "Reels and LEDs" window.
+- Add Drag n Drop support for loading .directb2s, .b2s and .b2b projects.
+- Add Drag n Drop support for creating snippits from .png files.
+- 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.
 
 2.1.0
 - Increased Max ZOrder to 19 from 9 by jonesyUK

b2sbackglassdesigner/b2sbackglassdesigner/classes/Tab/B2STabPage.vb

@@ -541,15 +541,7 @@ Public Class B2STabPage
                 Dim factor2 As Double = currentimage.Height / Me.Height
                 If factor < factor2 Then factor = factor2
                 Dim width As Integer = (BackglassData.Image.Width - 4) / factor
-                Dim height As Integer = (BackglassData.Image.Height - 4) / factor
-                PictureBox.Size = New Size(width, height)
-                If BackglassData.DMDImage IsNot Nothing Then
-                    width = (BackglassData.DMDImage.Width - 4) / factor
-                    height = (BackglassData.DMDImage.Height - 4) / factor
-                    DMDPictureBox.Size = New Size(width, height)
-                End If
-                BackglassData.Zoom = CInt(PictureBox.Size.Width / BackglassData.Image.Width * 100)
-                Me.Invalidate()
+                Zoom(CInt(width / BackglassData.Image.Width * 100))
             ElseIf zoomtext.Contains("%") AndAlso IsNumeric(zoomtext.Replace("%", "")) Then
                 Zoom(CInt(zoomtext.Replace("%", "")))
             End If
@@ -567,6 +559,7 @@ Public Class B2STabPage
             End If
             BackglassData.Zoom = zoomvalue
             Me.Invalidate()
+            UpdateStatusBar(B2SBackglassDesigner.formDesigner, Me)
         End If
     End Sub
 

b2sbackglassdesigner/b2sbackglassdesigner/formDesigner.vb

@@ -1940,6 +1940,7 @@ Public Class formDesigner
                 B2STab.AddBackglass(New B2STabPage(_backglassdata))
                 B2STab.SelectedIndex = B2STab.TabPages.Count - 1
                 Backglass.currentData.IsDirty = False
+                B2STab.SelectedTabPage.Zoom("Window")
             End If
             recent.AddToRecentList(_backglassdata)
         End If