Skip to content

Commit 1a3dddc

Browse files
neanea
authored
Merge pull request #71 from monoblaine/master
Fix minor errors and accessibility issues
2 parents 2301525 + e65b5c4 commit 1a3dddc

15 files changed

+144
-31
lines changed

‎MarkdownViewerPlusPlus/Forms/AbstractRenderer.Designer.cs‎

Lines changed: 33 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MarkdownViewerPlusPlus/Forms/AbstractRenderer.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,5 +390,25 @@ public bool IsOutlookInstalled()
390390

391391
return false;
392392
}
393+
394+
/// <summary>
395+
///
396+
/// </summary>
397+
/// <param name="sender"></param>
398+
/// <param name="e"></param>
399+
private void optionsToolStripMenuItem_Click(object sender, EventArgs e)
400+
{
401+
this.markdownViewer.OptionsCommand();
402+
}
403+
404+
/// <summary>
405+
///
406+
/// </summary>
407+
/// <param name="sender"></param>
408+
/// <param name="e"></param>
409+
private void aboutToolStripMenuItem1_Click(object sender, EventArgs e)
410+
{
411+
this.markdownViewer.AboutCommand();
412+
}
393413
}
394414
}

‎MarkdownViewerPlusPlus/Forms/MarkdownViewerOptions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public MarkdownViewerOptions(ref MarkdownViewerConfiguration configuration)
6666
this.optionPanels.Add(node.Tag.ToString(), optionsPanel);
6767
}
6868
//
69-
this.treeOptions.NodeMouseClick += treeOptions_NodeMouseClick;
69+
this.treeOptions.AfterSelect += treeOptions_AfterSelect;
7070
//Start with the general options panel
7171
this.splitOptions.Panel2.Controls.Add(this.optionPanels.First().Value);
7272
this.treeOptions.Select();
@@ -82,7 +82,7 @@ public MarkdownViewerOptions(ref MarkdownViewerConfiguration configuration)
8282
/// </summary>
8383
/// <param name="sender"></param>
8484
/// <param name="treeNodeEvent"></param>
85-
protected void treeOptions_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs treeNodeEvent)
85+
protected void treeOptions_AfterSelect(object sender, TreeViewEventArgs treeNodeEvent)
8686
{
8787
//Remove old (if any)
8888
if (this.splitOptions.Panel2.Controls.Count > 0)

‎MarkdownViewerPlusPlus/Forms/MarkdownViewerRenderer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ protected override void Init()
4343
this.markdownViewerHtmlPanel.ImageLoad += OnImageLoad;
4444
//Add to view
4545
this.Controls.Add(this.markdownViewerHtmlPanel);
46+
this.Controls.SetChildIndex(this.markdownViewerHtmlPanel, 0);
4647
}
4748

4849
/// <summary>

‎MarkdownViewerPlusPlus/MarkdownViewer.cs‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,22 @@ protected void UpdateScrollBar()
196196
try
197197
{
198198
ScrollInfo scrollInfo = this.Editor.GetScrollInfo(ScrollInfoMask.SIF_RANGE | ScrollInfoMask.SIF_TRACKPOS | ScrollInfoMask.SIF_PAGE, ScrollInfoBar.SB_VERT);
199-
var scrollRatio = (double)scrollInfo.nTrackPos / (scrollInfo.nMax - scrollInfo.nPage);
199+
double totalRange = scrollInfo.nMax - scrollInfo.nMin + 1;
200+
double scrollRatio;
201+
202+
// Is "Enable scrolling beyond last line" checked?
203+
if (Editor.GetEndAtLastLine() == false)
204+
{
205+
var actualThumbHeight = totalRange / (totalRange / scrollInfo.nPage - 1);
206+
var actualTrackPos = scrollInfo.nTrackPos * actualThumbHeight / scrollInfo.nPage;
207+
208+
scrollRatio = Math.Min(1, actualTrackPos / (totalRange - actualThumbHeight));
209+
}
210+
else
211+
{
212+
scrollRatio = scrollInfo.nTrackPos / (totalRange - scrollInfo.nPage);
213+
}
214+
200215
this.renderer.ScrollByRatioVertically(scrollRatio);
201216
}
202217
catch { }
@@ -226,7 +241,7 @@ public void CommandMenuInit()
226241
/// <summary>
227242
///
228243
/// </summary>
229-
private void OptionsCommand()
244+
public void OptionsCommand()
230245
{
231246
using (MarkdownViewerOptions options = new MarkdownViewerOptions(ref this.configuration))
232247
{
@@ -241,7 +256,7 @@ private void OptionsCommand()
241256
/// <summary>
242257
/// Show the AboutDialog as modal to the Notepad++ window
243258
/// </summary>
244-
private void AboutCommand()
259+
public void AboutCommand()
245260
{
246261
using (AboutDialog about = new AboutDialog())
247262
{
@@ -287,6 +302,7 @@ public void MarkdownViewerCommand()
287302
{
288303
UpdateEditorInformation();
289304
Update(true, true);
305+
Editor.SetFocus(true);
290306
}
291307
}
292308

‎MarkdownViewerPlusPlus/MarkdownViewerPlusPlus.csproj‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,26 +90,26 @@
9090
</PropertyGroup>
9191
<ItemGroup>
9292
<Reference Include="HtmlRenderer, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
93-
<HintPath>..\packages\HtmlRenderer.Core.1.5.1-beta2\lib\net40-client\HtmlRenderer.dll</HintPath>
93+
<HintPath>..\packages\HtmlRenderer.Core.1.5.1-beta3\lib\net40-client\HtmlRenderer.dll</HintPath>
9494
</Reference>
9595
<Reference Include="HtmlRenderer.PdfSharp, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
96-
<HintPath>..\packages\HtmlRenderer.PdfSharp.1.5.1-beta2\lib\net40-client\HtmlRenderer.PdfSharp.dll</HintPath>
96+
<HintPath>..\packages\HtmlRenderer.PdfSharp.1.5.1-beta3\lib\net40-client\HtmlRenderer.PdfSharp.dll</HintPath>
9797
</Reference>
9898
<Reference Include="HtmlRenderer.WinForms, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
99-
<HintPath>..\packages\HtmlRenderer.WinForms.1.5.1-beta2\lib\net40-client\HtmlRenderer.WinForms.dll</HintPath>
99+
<HintPath>..\packages\HtmlRenderer.WinForms.1.5.1-beta3\lib\net40-client\HtmlRenderer.WinForms.dll</HintPath>
100100
</Reference>
101-
<Reference Include="Markdig, Version=0.14.9.0, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>..\packages\Markdig.0.14.9\lib\net40\Markdig.dll</HintPath>
101+
<Reference Include="Markdig, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
102+
<HintPath>..\packages\Markdig.0.15.0\lib\net40\Markdig.dll</HintPath>
103103
</Reference>
104104
<Reference Include="Microsoft.CSharp" />
105105
<Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
106106
<EmbedInteropTypes>True</EmbedInteropTypes>
107107
</Reference>
108-
<Reference Include="PdfSharp, Version=1.50.4790.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
109-
<HintPath>..\packages\PDFsharp.1.50.4790-beta5a\lib\net20\PdfSharp.dll</HintPath>
108+
<Reference Include="PdfSharp, Version=1.50.4845.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
109+
<HintPath>..\packages\PDFsharp.1.50.4845-RC2a\lib\net20\PdfSharp.dll</HintPath>
110110
</Reference>
111-
<Reference Include="PdfSharp.Charting, Version=1.50.4790.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
112-
<HintPath>..\packages\PDFsharp.1.50.4790-beta5a\lib\net20\PdfSharp.Charting.dll</HintPath>
111+
<Reference Include="PdfSharp.Charting, Version=1.50.4845.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
112+
<HintPath>..\packages\PDFsharp.1.50.4845-RC2a\lib\net20\PdfSharp.Charting.dll</HintPath>
113113
</Reference>
114114
<Reference Include="PresentationCore" />
115115
<Reference Include="PresentationFramework" />
@@ -258,6 +258,9 @@
258258
</ItemGroup>
259259
<ItemGroup>
260260
<Content Include="ILMergeOrder.txt" />
261+
<None Include="Resources\fa-paypal-16x16.png" />
262+
<None Include="Resources\fa-info-16x16.png" />
263+
<None Include="Resources\fa-cog-16x16.png" />
261264
<None Include="Resources\Donate-PayPal-green.png" />
262265
</ItemGroup>
263266
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎MarkdownViewerPlusPlus/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.8.1.*")]
36-
[assembly: AssemblyFileVersion("0.8.1.0")]
35+
[assembly: AssemblyVersion("0.8.2.*")]
36+
[assembly: AssemblyFileVersion("0.8.2.0")]

‎MarkdownViewerPlusPlus/Properties/Resources.Designer.cs‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MarkdownViewerPlusPlus/Properties/Resources.resx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,13 @@
157157
<data name="Donate_PayPal_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
158158
<value>..\Resources\Donate-PayPal-green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
159159
</data>
160+
<data name="fa_cog_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
161+
<value>..\Resources\fa-cog-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
162+
</data>
163+
<data name="fa_info_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
164+
<value>..\Resources\fa-info-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
165+
</data>
166+
<data name="fa_paypal_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
167+
<value>..\Resources\fa-paypal-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
168+
</data>
160169
</root>

‎MarkdownViewerPlusPlus/Resources/fa-cog-16x16.png‎

405 Bytes
Loading

0 commit comments

Comments
 (0)