From f250bb893c740d963f4f53347e1ce2d998df3ade Mon Sep 17 00:00:00 2001 From: Nikolay Kuznetsov Date: Sat, 29 May 2021 22:02:39 +0200 Subject: [PATCH] Fix hyperlinks in mod info page --- VRCMelonAssistant/ModInfoWindow.xaml.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/VRCMelonAssistant/ModInfoWindow.xaml.cs b/VRCMelonAssistant/ModInfoWindow.xaml.cs index 76e0675..a25f71a 100644 --- a/VRCMelonAssistant/ModInfoWindow.xaml.cs +++ b/VRCMelonAssistant/ModInfoWindow.xaml.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System; using System.Windows; using System.Windows.Documents; @@ -24,7 +24,7 @@ namespace VRCMelonAssistant DownloadLink.Text = (string) FindResource("ModInfoWindow:DownloadLink"); DownloadLink.Inlines.Add(new Run(" ")); if (dlLink?.StartsWith("http") == true) - DownloadLink.Inlines.Add(WrapNavigator(new Hyperlink(new Run(dlLink)))); + DownloadLink.Inlines.Add(CreateHyperlink(dlLink)); else DownloadLink.Inlines.Add(new Run(dlLink)); @@ -32,15 +32,16 @@ namespace VRCMelonAssistant SourceCodeLink.Text = (string) FindResource("ModInfoWindow:SourceCodeLink"); SourceCodeLink.Inlines.Add(new Run(" ")); if (srcLink?.StartsWith("http") == true) - SourceCodeLink.Inlines.Add(WrapNavigator(new Hyperlink(new Run(srcLink)))); + SourceCodeLink.Inlines.Add(CreateHyperlink(srcLink)); else SourceCodeLink.Inlines.Add(new Run(srcLink)); InternalIds.Text = string.Format((string) FindResource("ModInfoWindow:InternalIds"), mod._id, mod.versions[0]._version); } - private static Hyperlink WrapNavigator(Hyperlink link) + private static Hyperlink CreateHyperlink(string uri) { + var link = new Hyperlink(new Run(uri)) {NavigateUri = new Uri(uri)}; link.RequestNavigate += HyperlinkExtensions.Hyperlink_RequestNavigate; return link; }