Minor

rampaa · Jan 24, 2024 · e27b9e8 · e27b9e8
1 parent b40c5e7
commit e27b9e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/JL.Windows/GUI/MainWindow.xaml.cs b/JL.Windows/GUI/MainWindow.xaml.cs
@@ -277,6 +277,7 @@ private async Task Precache(string input, CancellationToken cancellationToken)
                     bool pOrthographyInfo = jmdict.Options?.POrthographyInfo?.Value ?? true;
                     bool rOrthographyInfo = jmdict.Options?.ROrthographyInfo?.Value ?? true;
                     bool aOrthographyInfo = jmdict.Options?.AOrthographyInfo?.Value ?? true;
+                    double pOrthographyInfoFontSize = jmdict.Options?.POrthographyInfoFontSize?.Value ?? 15;
 
                     int resultCount = Math.Min(lookupResults.Count, ConfigManager.MaxNumResultsNotInMiningMode);
                     StackPanel[] popupItemSource = new StackPanel[resultCount];
@@ -289,7 +290,7 @@ private async Task Precache(string input, CancellationToken cancellationToken)
                             FirstPopupWindow.DictsWithResults.Add(lookupResult.Dict);
                         }
 
-                        popupItemSource[i] = FirstPopupWindow.PrepareResultStackPanel(lookupResult, i, lookupResults.Count, pitchDict, pitchDictIsActive, pOrthographyInfo, rOrthographyInfo, aOrthographyInfo);
+                        popupItemSource[i] = FirstPopupWindow.PrepareResultStackPanel(lookupResult, i, lookupResults.Count, pitchDict, pitchDictIsActive, pOrthographyInfo, rOrthographyInfo, aOrthographyInfo, pOrthographyInfoFontSize);
                     }
 
                     PopupWindow.StackPanelCache.AddReplace(text, popupItemSource);

diff --git a/JL.Windows/GUI/PopupWindow.xaml.cs b/JL.Windows/GUI/PopupWindow.xaml.cs
@@ -451,6 +451,7 @@ public void DisplayResults(bool generateAllResults, string? text = null)
             bool showPOrthographyInfo = jmdict.Options?.POrthographyInfo?.Value ?? true;
             bool showROrthographyInfo = jmdict.Options?.ROrthographyInfo?.Value ?? true;
             bool showAOrthographyInfo = jmdict.Options?.AOrthographyInfo?.Value ?? true;
+            double pOrthographyInfoFontSize = jmdict.Options?.POrthographyInfoFontSize?.Value ?? 15;
 
             int resultCount = generateAllResults
                 ? LastLookupResults.Count
@@ -467,7 +468,7 @@ public void DisplayResults(bool generateAllResults, string? text = null)
                     DictsWithResults.Add(lookupResult.Dict);
                 }
 
-                popupItemSource[i] = PrepareResultStackPanel(lookupResult, i, resultCount, pitchDict, pitchDictIsActive, showPOrthographyInfo, showROrthographyInfo, showAOrthographyInfo);
+                popupItemSource[i] = PrepareResultStackPanel(lookupResult, i, resultCount, pitchDict, pitchDictIsActive, showPOrthographyInfo, showROrthographyInfo, showAOrthographyInfo, pOrthographyInfoFontSize);
             }
 
             PopupListView.ItemsSource = popupItemSource;
@@ -482,7 +483,7 @@ public void DisplayResults(bool generateAllResults, string? text = null)
         }
     }
 
-    public StackPanel PrepareResultStackPanel(LookupResult result, int index, int resultsCount, Dict? pitchDict, bool pitchDictIsActive, bool showPOrthographyInfo, bool showROrthographyInfo, bool showAOrthographyInfo)
+    public StackPanel PrepareResultStackPanel(LookupResult result, int index, int resultsCount, Dict? pitchDict, bool pitchDictIsActive, bool showPOrthographyInfo, bool showROrthographyInfo, bool showAOrthographyInfo, double pOrthographyInfoFontSize)
     {
         // top
         WrapPanel top = new() { Tag = index };
@@ -528,7 +529,7 @@ public StackPanel PrepareResultStackPanel(LookupResult result, int index, int re
             TextBlock textBlockPOrthographyInfo = PopupWindowUtils.CreateTextBlock(nameof(result.PrimarySpellingOrthographyInfoList),
                 string.Create(CultureInfo.InvariantCulture, $"({string.Join(", ", result.PrimarySpellingOrthographyInfoList)})"),
                 DictOptionManager.POrthographyInfoColor,
-                result.Dict.Options?.POrthographyInfoFontSize?.Value ?? 15,
+                pOrthographyInfoFontSize,
                 PopupContextMenu,
                 VerticalAlignment.Center,
                 new Thickness(5, 0, 0, 0));