Merge pull request #71 from monoblaine/master

Fix minor errors and accessibility issues
nea · Apr 29, 2018 · 1a3dddc · 1a3dddc
2 parents 2301525 + e65b5c4
commit 1a3dddc
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 31 deletions.
diff --git a/MarkdownViewerPlusPlus/Forms/AbstractRenderer.Designer.cs b/MarkdownViewerPlusPlus/Forms/AbstractRenderer.Designer.cs
diff --git a/MarkdownViewerPlusPlus/Forms/AbstractRenderer.cs b/MarkdownViewerPlusPlus/Forms/AbstractRenderer.cs
@@ -390,5 +390,25 @@ public bool IsOutlookInstalled()
 
             return false;
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void optionsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            this.markdownViewer.OptionsCommand();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void aboutToolStripMenuItem1_Click(object sender, EventArgs e)
+        {
+            this.markdownViewer.AboutCommand();
+        }
     }
 }
diff --git a/MarkdownViewerPlusPlus/Forms/MarkdownViewerOptions.cs b/MarkdownViewerPlusPlus/Forms/MarkdownViewerOptions.cs
@@ -66,7 +66,7 @@ public MarkdownViewerOptions(ref MarkdownViewerConfiguration configuration)
                 this.optionPanels.Add(node.Tag.ToString(), optionsPanel);
             }
             //
-            this.treeOptions.NodeMouseClick += treeOptions_NodeMouseClick;
+            this.treeOptions.AfterSelect += treeOptions_AfterSelect;
             //Start with the general options panel
             this.splitOptions.Panel2.Controls.Add(this.optionPanels.First().Value);
             this.treeOptions.Select();
@@ -82,7 +82,7 @@ public MarkdownViewerOptions(ref MarkdownViewerConfiguration configuration)
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="treeNodeEvent"></param>
-        protected void treeOptions_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs treeNodeEvent)
+        protected void treeOptions_AfterSelect(object sender, TreeViewEventArgs treeNodeEvent)
         {
             //Remove old (if any)
             if (this.splitOptions.Panel2.Controls.Count > 0)

diff --git a/MarkdownViewerPlusPlus/Forms/MarkdownViewerRenderer.cs b/MarkdownViewerPlusPlus/Forms/MarkdownViewerRenderer.cs
@@ -43,6 +43,7 @@ protected override void Init()
             this.markdownViewerHtmlPanel.ImageLoad += OnImageLoad;
             //Add to view
             this.Controls.Add(this.markdownViewerHtmlPanel);
+            this.Controls.SetChildIndex(this.markdownViewerHtmlPanel, 0);
         }
 
         /// <summary>

diff --git a/MarkdownViewerPlusPlus/MarkdownViewer.cs b/MarkdownViewerPlusPlus/MarkdownViewer.cs
@@ -196,7 +196,22 @@ protected void UpdateScrollBar()
             try
             {
                 ScrollInfo scrollInfo = this.Editor.GetScrollInfo(ScrollInfoMask.SIF_RANGE | ScrollInfoMask.SIF_TRACKPOS | ScrollInfoMask.SIF_PAGE, ScrollInfoBar.SB_VERT);
-                var scrollRatio = (double)scrollInfo.nTrackPos / (scrollInfo.nMax - scrollInfo.nPage);
+                double totalRange = scrollInfo.nMax - scrollInfo.nMin + 1;
+                double scrollRatio;
+
+                // Is "Enable scrolling beyond last line" checked?
+                if (Editor.GetEndAtLastLine() == false)
+                {
+                    var actualThumbHeight = totalRange / (totalRange / scrollInfo.nPage - 1);
+                    var actualTrackPos = scrollInfo.nTrackPos * actualThumbHeight / scrollInfo.nPage;
+
+                    scrollRatio = Math.Min(1, actualTrackPos / (totalRange - actualThumbHeight));
+                }
+                else
+                {
+                    scrollRatio = scrollInfo.nTrackPos / (totalRange - scrollInfo.nPage);
+                }
+
                 this.renderer.ScrollByRatioVertically(scrollRatio);
             }
             catch { }            
@@ -226,7 +241,7 @@ public void CommandMenuInit()
         /// <summary>
         /// 
         /// </summary>
-        private void OptionsCommand()
+        public void OptionsCommand()
         {
             using (MarkdownViewerOptions options = new MarkdownViewerOptions(ref this.configuration))
             {
@@ -241,7 +256,7 @@ private void OptionsCommand()
         /// <summary>
         /// Show the AboutDialog as modal to the Notepad++ window
         /// </summary>
-        private void AboutCommand()
+        public void AboutCommand()
         {
             using (AboutDialog about = new AboutDialog())
             {
@@ -287,6 +302,7 @@ public void MarkdownViewerCommand()
             {
                 UpdateEditorInformation();
                 Update(true, true);
+                Editor.SetFocus(true);
             }            
         }
 

diff --git a/MarkdownViewerPlusPlus/MarkdownViewerPlusPlus.csproj b/MarkdownViewerPlusPlus/MarkdownViewerPlusPlus.csproj
@@ -90,26 +90,26 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HtmlRenderer, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlRenderer.Core.1.5.1-beta2\lib\net40-client\HtmlRenderer.dll</HintPath>
+      <HintPath>..\packages\HtmlRenderer.Core.1.5.1-beta3\lib\net40-client\HtmlRenderer.dll</HintPath>
     </Reference>
     <Reference Include="HtmlRenderer.PdfSharp, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlRenderer.PdfSharp.1.5.1-beta2\lib\net40-client\HtmlRenderer.PdfSharp.dll</HintPath>
+      <HintPath>..\packages\HtmlRenderer.PdfSharp.1.5.1-beta3\lib\net40-client\HtmlRenderer.PdfSharp.dll</HintPath>
     </Reference>
     <Reference Include="HtmlRenderer.WinForms, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlRenderer.WinForms.1.5.1-beta2\lib\net40-client\HtmlRenderer.WinForms.dll</HintPath>
+      <HintPath>..\packages\HtmlRenderer.WinForms.1.5.1-beta3\lib\net40-client\HtmlRenderer.WinForms.dll</HintPath>
     </Reference>
-    <Reference Include="Markdig, Version=0.14.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdig.0.14.9\lib\net40\Markdig.dll</HintPath>
+    <Reference Include="Markdig, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdig.0.15.0\lib\net40\Markdig.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="PdfSharp, Version=1.50.4790.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.50.4790-beta5a\lib\net20\PdfSharp.dll</HintPath>
+    <Reference Include="PdfSharp, Version=1.50.4845.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp.1.50.4845-RC2a\lib\net20\PdfSharp.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Charting, Version=1.50.4790.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.50.4790-beta5a\lib\net20\PdfSharp.Charting.dll</HintPath>
+    <Reference Include="PdfSharp.Charting, Version=1.50.4845.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp.1.50.4845-RC2a\lib\net20\PdfSharp.Charting.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -258,6 +258,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ILMergeOrder.txt" />
+    <None Include="Resources\fa-paypal-16x16.png" />
+    <None Include="Resources\fa-info-16x16.png" />
+    <None Include="Resources\fa-cog-16x16.png" />
     <None Include="Resources\Donate-PayPal-green.png" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/MarkdownViewerPlusPlus/Properties/AssemblyInfo.cs b/MarkdownViewerPlusPlus/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.8.2.*")]
+[assembly: AssemblyFileVersion("0.8.2.0")]
diff --git a/MarkdownViewerPlusPlus/Properties/Resources.Designer.cs b/MarkdownViewerPlusPlus/Properties/Resources.Designer.cs
diff --git a/MarkdownViewerPlusPlus/Properties/Resources.resx b/MarkdownViewerPlusPlus/Properties/Resources.resx
@@ -157,4 +157,13 @@
   <data name="Donate_PayPal_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Donate-PayPal-green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="fa_cog_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fa-cog-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fa_info_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fa-info-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fa_paypal_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fa-paypal-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/MarkdownViewerPlusPlus/Resources/fa-cog-16x16.png b/MarkdownViewerPlusPlus/Resources/fa-cog-16x16.png
diff --git a/MarkdownViewerPlusPlus/Resources/fa-info-16x16.png b/MarkdownViewerPlusPlus/Resources/fa-info-16x16.png
diff --git a/MarkdownViewerPlusPlus/Resources/fa-paypal-16x16.png b/MarkdownViewerPlusPlus/Resources/fa-paypal-16x16.png
diff --git a/MarkdownViewerPlusPlus/app.config b/MarkdownViewerPlusPlus/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="PdfSharp" publicKeyToken="f94615aa0424f9eb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.50.4790.0" newVersion="1.50.4790.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.50.4845.0" newVersion="1.50.4845.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/MarkdownViewerPlusPlus/packages.config b/MarkdownViewerPlusPlus/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HtmlRenderer.Core" version="1.5.1-beta2" targetFramework="net40" />
-  <package id="HtmlRenderer.PdfSharp" version="1.5.1-beta2" targetFramework="net40" />
-  <package id="HtmlRenderer.WinForms" version="1.5.1-beta2" targetFramework="net40" />
+  <package id="HtmlRenderer.Core" version="1.5.1-beta3" targetFramework="net40" />
+  <package id="HtmlRenderer.PdfSharp" version="1.5.1-beta3" targetFramework="net40" />
+  <package id="HtmlRenderer.WinForms" version="1.5.1-beta3" targetFramework="net40" />
   <package id="ILMerge" version="2.14.1208" targetFramework="net40" />
-  <package id="Markdig" version="0.14.9" targetFramework="net40" />
+  <package id="Markdig" version="0.15.0" targetFramework="net40" />
   <package id="MSBuild.Extension.Pack" version="1.9.1" targetFramework="net40" />
   <package id="MSBuild.ILMerge.Task" version="1.0.5" targetFramework="net40" />
-  <package id="PDFsharp" version="1.50.4790-beta5a" targetFramework="net40" />
+  <package id="PDFsharp" version="1.50.4845-RC2a" targetFramework="net40" />
   <package id="Svg" version="2.3.0" targetFramework="net40" />
 </packages>