Merge pull request #646 from JoeRobich/Fix-Image-Scaling-Issues2

Fix DockPanel and Marker image scaling issues 2

Author: Meychi

External/Plugins/FlashDebugger/FlashDebugger.csproj

@@ -172,12 +172,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Icons\Breakpoints\CurLine.bmp" />
-    <None Include="Icons\Breakpoints\Disabled.bmp" />
-    <None Include="Icons\Breakpoints\Enabled.bmp" />
     <Content Include="fbd.j4n.jar">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Icons\Breakpoints\CurLine.png" />
+    <Content Include="Icons\Breakpoints\Disabled.png" />
+    <Content Include="Icons\Breakpoints\Enabled.png" />
     <Content Include="Icons\Continue.png" />
     <Content Include="Icons\Current.png" />
     <None Include="Icons\DeleteBreakpoints.png" />

External/Plugins/FlashDebugger/Helpers/ScintillaHelper.cs

@@ -7,6 +7,7 @@
 using ScintillaNet.Configuration;
 using PluginCore.Managers;
 using PluginCore.Helpers;
+using System.Drawing;
 
 namespace FlashDebugger
 {
@@ -46,9 +47,12 @@ static public void InitMarkers(ScintillaControl sci)
             mask |= GetMarkerMask(markerBPNotAvailable);
             mask |= GetMarkerMask(markerCurrentLine);
             sci.SetMarginMaskN(0, mask);
-            sci.MarkerDefinePixmap(markerBPEnabled, ScintillaNet.XPM.ConvertToXPM(Properties.Resource.Enabled, "#00FF00"));
-            sci.MarkerDefinePixmap(markerBPDisabled, ScintillaNet.XPM.ConvertToXPM(Properties.Resource.Disabled, "#00FF00"));
-            sci.MarkerDefinePixmap(markerCurrentLine, ScintillaNet.XPM.ConvertToXPM(Properties.Resource.CurLine, "#00FF00"));
+            var enabledImage = ScaleHelper.Scale(Properties.Resource.Enabled);
+            var disabledImage = ScaleHelper.Scale(Properties.Resource.Disabled);
+            var curlineImage = ScaleHelper.Scale(Properties.Resource.CurLine);
+            sci.MarkerDefinePixmap(markerBPEnabled, ScintillaNet.XPM.ConvertToXPM(enabledImage, "#00FF00"));
+            sci.MarkerDefinePixmap(markerBPDisabled, ScintillaNet.XPM.ConvertToXPM(disabledImage, "#00FF00"));
+            sci.MarkerDefinePixmap(markerCurrentLine, ScintillaNet.XPM.ConvertToXPM(curlineImage, "#00FF00"));
             Language lang = PluginBase.MainForm.SciConfig.GetLanguage("as3"); // default
             sci.MarkerSetBack(markerBPEnabled, lang.editorstyle.ErrorLineBack); // enable
             sci.MarkerSetBack(markerBPDisabled, lang.editorstyle.DisabledLineBack); // disable

External/Plugins/FlashDebugger/Icons/Breakpoints/CurLine.bmp

@@ -119,16 +119,16 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="CurLine" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Icons\Breakpoints\CurLine.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Icons\Breakpoints\CurLine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Current" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Icons\Current.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Icons\Breakpoints\Disabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Icons\Breakpoints\Disabled.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Enabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Icons\Breakpoints\Enabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Icons\Breakpoints\Enabled.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Finish" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Icons\Finish.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>