Merge pull request #436 from Freeesia/copilot/fix-435

オーバレイ表示の前後関係の安定化

Author: Freeesia

WindowTranslator/Data/AreaToZIndexConverter.cs

@@ -0,0 +1,27 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace WindowTranslator.Data;
+
+[ValueConversion(typeof(TextRect), typeof(int))]
+public sealed class AreaToZIndexConverter : IValueConverter
+{
+    /// <summary>デフォルトインスタンスを取得</summary>
+    public static AreaToZIndexConverter Default { get; } = new AreaToZIndexConverter();
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is not TextRect rect)
+        {
+            return DependencyProperty.UnsetValue;
+        }
+
+        // 面積を計算してマイナス値として返す（小さい面積ほど大きなZIndex値になり前面に表示される）
+        var area = rect.Width * rect.Height;
+        return -(int)area;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}

WindowTranslator/Themes/Generic.xaml

@@ -29,6 +29,7 @@
                                 MaxValue="10"
                                 MinValue="2"
                                 ScaleFactor="0.15" />
+                            <data:AreaToZIndexConverter x:Key="a2zConv" />
                         </ItemsControl.Resources>
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -112,6 +113,7 @@
                             <Style TargetType="ContentPresenter">
                                 <Setter Property="Canvas.Top" Value="{Binding Y}" />
                                 <Setter Property="Canvas.Left" Value="{Binding X}" />
+                                <Setter Property="Panel.ZIndex" Value="{Binding Converter={StaticResource a2zConv}}" />
                                 <Setter Property="Visibility">
                                     <Setter.Value>
                                         <MultiBinding Converter="{x:Static data:TextOverlayVisibilityConverter.Default}">