Add the “Show images at the bottom instead of the top” dictionary option. Disabling it shows definition images above an entry’s definition instead of below.

rampaa · rampaa · commit b497c96a02de · 2026-02-07T17:46:32.000+03:00
diff --git a/JL.Core/Dicts/DictUtils.cs b/JL.Core/Dicts/DictUtils.cs
@@ -74,7 +74,8 @@ public static class DictUtils
                 new DictOptions(
                     new UseDBOption(false),
                     new NoAllOption(false),
-                    showImages: new ShowImagesOption(true)),
+                    showImages: new ShowImagesOption(true),
+                    showImageAtBottom: new ShowImageAtBottomOption(true)),
                 autoUpdatable: false,
                 url: null,
                 revision: null)
@@ -100,7 +101,8 @@ public static class DictUtils
                 new DictOptions(
                     new UseDBOption(false),
                     new NoAllOption(false),
-                    showImages: new ShowImagesOption(true)),
+                    showImages: new ShowImagesOption(true),
+                    showImageAtBottom: new ShowImageAtBottomOption(true)),
                 autoUpdatable: false,
                 url: null,
                 revision: null)
@@ -1606,13 +1608,18 @@ private static void InitDictOptions(Dict dict)
         else if (dict.Type is DictType.CustomNameDictionary or DictType.ProfileCustomNameDictionary)
         {
             dict.Options.ShowImages = new ShowImagesOption(true);
+            dict.Options.ShowImageAtBottom = new ShowImageAtBottomOption(true);
         }
         else
         {
             if (ShowImagesOption.ValidDictTypes.Contains(dict.Type))
             {
                 dict.Options.ShowImages ??= new ShowImagesOption(true);
             }
+            if (ShowImageAtBottomOption.ValidDictTypes.Contains(dict.Type))
+            {
+                dict.Options.ShowImageAtBottom ??= new ShowImageAtBottomOption(true);
+            }
             if (NewlineBetweenDefinitionsOption.ValidDictTypes.Contains(dict.Type))
             {
                 dict.Options.NewlineBetweenDefinitions ??= new NewlineBetweenDefinitionsOption(true);
diff --git a/JL.Core/Dicts/Options/AvailableDictOptions.cs b/JL.Core/Dicts/Options/AvailableDictOptions.cs
@@ -143,5 +143,17 @@ public sealed class ShowImagesOption(bool value)
     [JsonIgnore]
     public static readonly DictType[] ValidDictTypes =
         [DictType.NonspecificWordYomichan, DictType.NonspecificNameYomichan, DictType.NonspecificKanjiWithWordSchemaYomichan, DictType.NonspecificYomichan, DictType.NonspecificKanjiYomichan,
-        DictType.NonspecificNameNazeka, DictType.NonspecificWordNazeka, DictType.NonspecificNazeka, DictType.NonspecificKanjiNazeka];
+        DictType.NonspecificNameNazeka, DictType.NonspecificWordNazeka, DictType.NonspecificNazeka, DictType.NonspecificKanjiNazeka,
+        DictType.CustomNameDictionary, DictType.ProfileCustomNameDictionary];
+}
+
+public sealed class ShowImageAtBottomOption(bool value)
+{
+    public bool Value { get; set; } = value;
+
+    [JsonIgnore]
+    public static readonly DictType[] ValidDictTypes =
+        [DictType.NonspecificWordYomichan, DictType.NonspecificNameYomichan, DictType.NonspecificKanjiWithWordSchemaYomichan, DictType.NonspecificYomichan, DictType.NonspecificKanjiYomichan,
+        DictType.NonspecificNameNazeka, DictType.NonspecificWordNazeka, DictType.NonspecificNazeka, DictType.NonspecificKanjiNazeka,
+        DictType.CustomNameDictionary, DictType.ProfileCustomNameDictionary];
 }
diff --git a/JL.Core/Dicts/Options/DictOptions.cs b/JL.Core/Dicts/Options/DictOptions.cs
@@ -21,7 +21,8 @@ public sealed class DictOptions(
     AntonymOption? antonym = null,
     ShowPitchAccentWithDottedLinesOption? showPitchAccentWithDottedLines = null,
     AutoUpdateAfterNDaysOption? autoUpdateAfterNDays = null,
-    ShowImagesOption? showImages = null)
+    ShowImagesOption? showImages = null,
+    ShowImageAtBottomOption? showImageAtBottom = null)
 {
     public UseDBOption UseDB { get; } = useDB;
     public NoAllOption NoAll { get; } = noAll;
@@ -47,4 +48,5 @@ public sealed class DictOptions(
     public AutoUpdateAfterNDaysOption? AutoUpdateAfterNDays { get; internal set; } = autoUpdateAfterNDays;
 
     public ShowImagesOption? ShowImages { get; internal set; } = showImages;
+    public ShowImageAtBottomOption? ShowImageAtBottom { get; internal set; } = showImageAtBottom;
 }
diff --git a/JL.Windows/GUI/Options/DictOptionsControl.xaml b/JL.Windows/GUI/Options/DictOptionsControl.xaml
@@ -126,6 +126,15 @@
                     <TextBlock Text="Show images" TextWrapping="Wrap" HorizontalAlignment="Left" Style="{StaticResource TextBlockDefault}" />
                 </CheckBox>
 
+                <CheckBox Name="ShowImageAtBottomCheckBox" Margin="10" Visibility="Collapsed" HorizontalAlignment="Left">
+                    <TextBlock Text="Show images at the bottom instead of the top"
+                               ToolTip="If unchecked, definition images are shown above an entry’s definition instead of below."
+                               Cursor="Help"
+                               TextWrapping="Wrap"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource TextBlockDefault}" />
+                </CheckBox>
+
                 <CheckBox Name="ShowPitchAccentWithDottedLinesCheckBox" Margin="10" Visibility="Collapsed" HorizontalAlignment="Left">
                     <TextBlock Text="Show pitch accent with dotted lines"
                                ToolTip="If unchecked, pitch accent will be shown with solid lines"
diff --git a/JL.Windows/GUI/Options/DictOptionsControl.xaml.cs b/JL.Windows/GUI/Options/DictOptionsControl.xaml.cs
@@ -179,6 +179,13 @@ public DictOptions GetDictOptions(DictType type, bool autoUpdatable)
             showImagesOption = new ShowImagesOption(ShowImagesCheckBox.IsChecked.Value);
         }
 
+        ShowImageAtBottomOption? showImageAtBottomOption = null;
+        if (ShowImageAtBottomOption.ValidDictTypes.Contains(type))
+        {
+            Debug.Assert(ShowImageAtBottomCheckBox.IsChecked is not null);
+            showImageAtBottomOption = new ShowImageAtBottomOption(ShowImageAtBottomCheckBox.IsChecked.Value);
+        }
+
         DictOptions options = new(
             useDBOption,
             noAllOption,
@@ -200,7 +207,8 @@ public DictOptions GetDictOptions(DictType type, bool autoUpdatable)
             antonymOption,
             showPitchAccentWithDottedLines,
             autoUpdateAfterNDaysOption,
-            showImagesOption);
+            showImagesOption,
+            showImageAtBottomOption);
 
         return options;
     }
@@ -225,6 +233,7 @@ public void GenerateDictOptionsElements(DictType dictType, DictOptions? dictOpti
         OptionUtils.ChangeVisibilityOfCheckBox(UseDBOption.ValidDictTypes.Contains(dictType), UseDBCheckBox, dictOptions?.UseDB.Value ?? true, ref showDictOptions);
         OptionUtils.ChangeVisibilityOfCheckBox(ShowPitchAccentWithDottedLinesOption.ValidDictTypes.Contains(dictType), ShowPitchAccentWithDottedLinesCheckBox, dictOptions?.ShowPitchAccentWithDottedLines?.Value ?? true, ref showDictOptions);
         OptionUtils.ChangeVisibilityOfCheckBox(ShowImagesOption.ValidDictTypes.Contains(dictType), ShowImagesCheckBox, dictOptions?.ShowImages?.Value ?? true, ref showDictOptions);
+        OptionUtils.ChangeVisibilityOfCheckBox(ShowImageAtBottomOption.ValidDictTypes.Contains(dictType), ShowImageAtBottomCheckBox, dictOptions?.ShowImageAtBottom?.Value ?? true, ref showDictOptions);
         OptionUtils.ChangeVisibilityOfColorButton(PitchAccentMarkerColorOption.ValidDictTypes.Contains(dictType), PitchAccentMarkerColorButton, PitchAccentMarkerColorDockPanel, dictOptions?.PitchAccentMarkerColor?.Value, DictOptionManager.PitchAccentMarkerColor, ref showDictOptions);
         OptionUtils.ChangeVisibilityOfColorButton(POrthographyInfoColorOption.ValidDictTypes.Contains(dictType), POrthographyInfoColorButton, POrthographyInfoColorDockPanel, dictOptions?.POrthographyInfoColor?.Value, DictOptionManager.POrthographyInfoColor, ref showDictOptions);
         OptionUtils.ChangeVisibilityOfNumericUpDown(POrthographyInfoFontSizeOption.ValidDictTypes.Contains(dictType), POrthographyInfoFontSizeNumericUpDown, POrthographyInfoFontSizeDockPanel, dictOptions?.POrthographyInfoFontSize?.Value ?? 15, ref showDictOptions);
diff --git a/JL.Windows/GUI/Popup/PopupContentGenerator.cs b/JL.Windows/GUI/Popup/PopupContentGenerator.cs
@@ -55,9 +55,24 @@ private static StackPanel PrepareResultStackPanel(LookupDisplayResult lookupDisp
         CreateMiningButton(lookupDisplayResult, top);
 
         StackPanel bottom = new();
+
+        bool imagesExist = result.ImagePaths is not null;
+        Debug.Assert(!imagesExist || (result.Dict.Options.ShowImages is not null && result.Dict.Options.ShowImageAtBottom is not null));
+        bool showImagesAtBottom = imagesExist && result.Dict.Options.ShowImageAtBottom!.Value;
+
+        if (imagesExist && !showImagesAtBottom)
+        {
+            CreateImages(lookupDisplayResult, bottom);
+        }
+
         CreateFormattedDefinition(lookupDisplayResult, bottom);
         CreateKanjiText(ownerWindow, result.KanjiLookupResult, bottom);
-        CreateImages(lookupDisplayResult, bottom);
+
+        if (imagesExist && showImagesAtBottom)
+        {
+            CreateImages(lookupDisplayResult, bottom);
+        }
+
         CreateSeparator(lookupDisplayResult.NonLastItem, bottom);
 
         StackPanel stackPanel = new()
@@ -630,11 +645,6 @@ private static void CreateKanjiText(PopupWindow ownerWindow, KanjiLookupResult?
     private static void CreateImages(LookupDisplayResult lookupDisplayResult, StackPanel bottom)
     {
         LookupResult result = lookupDisplayResult.LookupResult;
-        if (result.ImagePaths is null)
-        {
-            return;
-        }
-
         ShowImagesOption? showImagesOption = result.Dict.Options.ShowImages;
         Debug.Assert(showImagesOption is not null);
         if (!showImagesOption.Value)
@@ -646,6 +656,7 @@ private static void CreateImages(LookupDisplayResult lookupDisplayResult, StackP
         int maxPopupWidth = double.ConvertToIntegerNative<int>(lookupDisplayResult.OwnerWindow.MaxWidth * dpi.DpiScaleX);
         int maxPopupHeight = double.ConvertToIntegerNative<int>(lookupDisplayResult.OwnerWindow.MaxHeight * dpi.DpiScaleY);
 
+        Debug.Assert(result.ImagePaths is not null);
         for (int i = 0; i < result.ImagePaths.Length; i++)
         {
             string imagePath = Path.GetFullPath(result.ImagePaths[i], AppInfo.ApplicationPath);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public sealed class DictOptions(`
`21`	`21`	`AntonymOption? antonym = null,`
`22`	`22`	`ShowPitchAccentWithDottedLinesOption? showPitchAccentWithDottedLines = null,`
`23`	`23`	`AutoUpdateAfterNDaysOption? autoUpdateAfterNDays = null,`
`24`		`- ShowImagesOption? showImages = null)`
	`24`	`+ ShowImagesOption? showImages = null,`
	`25`	`+ ShowImageAtBottomOption? showImageAtBottom = null)`
`25`	`26`	`{`
`26`	`27`	`public UseDBOption UseDB { get; } = useDB;`
`27`	`28`	`public NoAllOption NoAll { get; } = noAll;`
`@@ -47,4 +48,5 @@ public sealed class DictOptions(`
`47`	`48`	`public AutoUpdateAfterNDaysOption? AutoUpdateAfterNDays { get; internal set; } = autoUpdateAfterNDays;`
`48`	`49`
`49`	`50`	`public ShowImagesOption? ShowImages { get; internal set; } = showImages;`
	`51`	`+ public ShowImageAtBottomOption? ShowImageAtBottom { get; internal set; } = showImageAtBottom;`
`50`	`52`	`}`