Merge pull request #39 from tomaz82/cleanup-resources

Author: JockeJarre

b2sbackglassdesigner/b2sbackglassdesigner/forms/formToolResources.resx

@@ -126,7 +126,7 @@
     <value>0, 0</value>
   </data>
   <data name="lbImages.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 206</value>
+    <value>234, 206</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="lbImages.TabIndex" type="System.Int32, mscorlib">
@@ -154,7 +154,7 @@
     <value>50</value>
   </data>
   <data name="txtRomID.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 21</value>
+    <value>135, 21</value>
   </data>
   <data name="txtRomID.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -217,7 +217,7 @@
     <value>87, 60</value>
   </data>
   <data name="cmbROMIDType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 21</value>
+    <value>135, 21</value>
   </data>
   <data name="cmbROMIDType.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -277,7 +277,7 @@
     <value>87, 6</value>
   </data>
   <data name="cmbImageType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 21</value>
+    <value>135, 21</value>
   </data>
   <data name="cmbImageType.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -331,7 +331,7 @@
     <value>0, 206</value>
   </data>
   <data name="PanelImages.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 90</value>
+    <value>234, 90</value>
   </data>
   <data name="PanelImages.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -358,13 +358,13 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>179, 296</value>
+    <value>234, 296</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt</value>
   </data>
   <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>150, 250</value>
+    <value>250, 250</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>Manual</value>

b2sbackglassdesigner/b2sbackglassdesigner/forms/formToolResources.vb

@@ -85,23 +85,18 @@ Public Class formToolResources
             e.DrawFocusRectangle()
             'e.Graphics.FillRectangle(If(e.Index = lbImages.SelectedIndex, New SolidBrush(Color.FromKnownColor(KnownColor.Highlight)), Brushes.White), e.Bounds)
             If IsTitleItem(item) Then
-                TextRenderer.DrawText(e.Graphics, item.Text, New Font(Me.Font.Name, Me.Font.Size + 1, FontStyle.Bold Or FontStyle.Underline), e.Bounds, Color.Black, TextFormatFlags.WordBreak Or TextFormatFlags.HorizontalCenter Or TextFormatFlags.VerticalCenter)
+                TextRenderer.DrawText(e.Graphics, item.Text, New Font(Me.Font.Name, Me.Font.Size + 1, FontStyle.Bold Or FontStyle.Underline), New Rectangle(e.Bounds.X + 138, e.Bounds.Y, e.Bounds.Width - 143, e.Bounds.Height), Color.Black, TextFormatFlags.WordBreak Or TextFormatFlags.HorizontalCenter Or TextFormatFlags.VerticalCenter)
             Else
-                Dim imagewidth As Integer = 0
                 ' maybe draw preview image
-                Dim isSmallImage As Boolean = False
                 If item.Image IsNot Nothing Then
                     ' maybe shrink image
-                    isSmallImage = (item.Type = Images.eImageInfoType.IlluminationSnippits)
-                    Dim factor As Single = item.Image.Height / If(isSmallImage, 32, 48) 'If(item.Image.Width > item.Image.Height, item.Image.Width / 48, item.Image.Height / 48)
-                    Dim helper As HelperBase = New HelperBase()
-                    Dim shrinkedimage As Image = item.Image.Resized(New Size(Math.Min(item.Image.Width / factor, e.Bounds.Width / 2), item.Image.Height / factor))
-                    imagewidth = shrinkedimage.Width
+                    Dim factor As Single = Math.Max(item.Image.Width / 128, item.Image.Height / 48)
+                    Dim shrinkedimage As Image = item.Image.Resized(New Size(item.Image.Width / factor, item.Image.Height / factor))
                     ' draw image
-                    e.Graphics.DrawImage(shrinkedimage, New Point(5, e.Bounds.Y + 3 + If(isSmallImage, 8, 0)))
+                    e.Graphics.DrawImage(shrinkedimage, New Point(5, e.Bounds.Y + 3))
                 End If
                 ' text 
-                TextRenderer.DrawText(e.Graphics, item.Text.Replace("\", "\ "), Me.Font, New Rectangle(imagewidth + 10, e.Bounds.Y, e.Bounds.Width - imagewidth - 15, e.Bounds.Height - 2), Color.Black, TextFormatFlags.VerticalCenter Or TextFormatFlags.HorizontalCenter Or TextFormatFlags.WordBreak)
+                TextRenderer.DrawText(e.Graphics, item.Text.Replace("\", "\ "), Me.Font, New Rectangle(e.Bounds.X + 138, e.Bounds.Y, e.Bounds.Width - 143, e.Bounds.Height), Color.Black, TextFormatFlags.VerticalCenter Or TextFormatFlags.HorizontalCenter Or TextFormatFlags.WordBreak)
             End If
         End If