fixed issue where richtext symbols didn't scale with the font size in…

… deck editor
octgn · Apr 23, 2024 · b8721de · b8721de
1 parent 821ed29
commit b8721de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/octgnFX/Octgn.JodsEngine/DeckBuilder/SearchControl.xaml.cs b/octgnFX/Octgn.JodsEngine/DeckBuilder/SearchControl.xaml.cs
@@ -380,7 +380,7 @@ private void GenerateColumns(DataNew.Entities.Game game)
                         Path = new PropertyPath(prop.Name),
                         Mode = BindingMode.OneTime,
                         Converter = new RichTextConverter(),
-                        ConverterParameter = game
+                        ConverterParameter = game.DeckEditorFont
                     };
 
                     var factory = new FrameworkElementFactory(typeof(RichTextBlock));

diff --git a/octgnFX/Octgn.JodsEngine/Play/Gui/CardControl.xaml.cs b/octgnFX/Octgn.JodsEngine/Play/Gui/CardControl.xaml.cs
@@ -350,7 +350,7 @@ private static void RestoreCardHandler(object sender, RoutedEventArgs e)
             // detaches and then re-attaches the control, e.g. when we change Z-order
             // by calling Move on an ObservableCollection.
             /*	if (_card == null)
-              {
+            {
                 _card = DataContext as Card;
                 if (_card != null) _card.PropertyChanged += PropertyChangeHandler;
               }*/
@@ -1205,7 +1205,7 @@ private void Card_ToolTipOpening(object sender, ToolTipEventArgs e)
                         tooltipTextBlock.Inlines.Add(new Run(property.Key.Name + ": ") { FontWeight = FontWeights.Bold });
                         if (property.Key.Type == PropertyType.RichText && property.Value is RichTextPropertyValue richText)
                         {
-                            tooltipTextBlock.Inlines.Add(RichTextConverter.ConvertToSpan(richText, Program.GameEngine.Definition));
+                            tooltipTextBlock.Inlines.Add(RichTextConverter.ConvertToSpan(richText, Program.GameEngine.Definition.NoteFont));
                         }
                         else
                         {

diff --git a/octgnFX/Octgn.JodsEngine/Utils/Converters/RichTextConverter.cs b/octgnFX/Octgn.JodsEngine/Utils/Converters/RichTextConverter.cs
@@ -20,11 +20,11 @@ namespace Octgn.Utils.Converters
     public class RichTextConverter : IValueConverter
     {
         internal static ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        internal static Game Game;
+        internal static Font Font;
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            Game = parameter as Game;
+            Font = parameter as Font;
             var propval = value as RichTextPropertyValue;
             if (propval == null) return null;
             if (!(propval.Value is IRichText)) throw new InvalidOperationException($"{nameof(RichTextPropertyValue)}.{nameof(value)} is the wrong type");
@@ -34,9 +34,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             return span.Inlines.ToList();
         }
 
-        public static Span ConvertToSpan(RichTextPropertyValue value, Game game)
+        public static Span ConvertToSpan(RichTextPropertyValue value, Font font)
         {
-            Game = game;
+            Font = font;
             Span span = new Span();
             InternalProcess(span, value.Value);
             return span;
@@ -90,7 +90,7 @@ private static void InternalProcess(Span span, IRichText node)
                     var image = new Image
                     {
                         Margin = new Thickness(0, 0, 0, -2),
-                        Height = span.FontSize + 2,
+                        Height = Font.Size + 2,
                         Stretch = Stretch.Uniform,
                         Source = new BitmapImage(new Uri(symbol.Source)),
                         ToolTip = symbol.Name