diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs index 6cb71e5b..e2fd00a7 100644 --- a/AideDeJeu/AideDeJeu/Tools/Converters.cs +++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs @@ -37,11 +37,14 @@ namespace AideDeJeu.Tools { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var node = value as HtmlNode; - if (node != null) + var str = value as string; + if (str != null) { + var doc = new HtmlDocument(); + doc.LoadHtml(str); + var fs = new FormattedString(); - FormatedTextHelpers.HtmlNodeToFormatedString(node, fs); + FormatedTextHelpers.HtmlNodeToFormatedString(doc.DocumentNode, fs); return fs; } else diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs index 58727c82..61c40f18 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs @@ -36,7 +36,7 @@ namespace AideDeJeu.ViewModels var fs = new FormattedString(); if (Item?.DescriptionDiv != null) { - FormatedTextHelpers.HtmlNodeToFormatedString(Item?.DescriptionDiv, fs, FontAttributes.None); + FormatedTextHelpers.HtmlNodeToFormatedString(global::AideDeJeuLib.Item.StringToNode(Item?.DescriptionHtml), fs, FontAttributes.None); } return fs; } diff --git a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml index d9106d59..49ecc779 100644 --- a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml @@ -1,8 +1,16 @@  + + + + + + + diff --git a/AideDeJeu/AideDeJeuLib/Item.cs b/AideDeJeu/AideDeJeuLib/Item.cs index a814ee71..1e6ed06f 100644 --- a/AideDeJeu/AideDeJeuLib/Item.cs +++ b/AideDeJeu/AideDeJeuLib/Item.cs @@ -24,6 +24,14 @@ namespace AideDeJeuLib return strings; } + public static HtmlNode StringToNode(string str) + { + if (str == null) return null; + var doc = new HtmlDocument(); + doc.LoadHtml(str); + return doc.DocumentNode; + } + //public static IEnumerable StringListToNodeList(IEnumerable strings) //{ // if (strings == null) return null;