fix:合并冲突

2025-08-31 12:16:29 +08:00
parent fb31f8df11
commit fad2571edb
3 changed files with 51 additions and 49 deletions
@@ -18,14 +18,12 @@
        <!-- 半透明遮罩 -->
        <Rectangle Name="OverlayRectangle"
                   Fill="Black"
-                   Opacity="0.3"
-                   IsHitTestVisible="False" />
+                   Opacity="0.3" />

        <!-- 透明选择区域遮罩 - 使用正确的几何体操作 -->
        <Rectangle Name="TransparentSelectionMask"
                   Fill="Black"
                   Opacity="0.3"
-                   IsHitTestVisible="False"
                   Visibility="Collapsed">
            <Rectangle.Clip>
                <CombinedGeometry GeometryCombineMode="Exclude">
@@ -45,9 +43,8 @@
            <Rectangle Name="SelectionRectangle"
                       Stroke="White"
                       StrokeThickness="1"
-                       Fill="#01FFFFFF"
+                       Fill="#01000000"
                       Visibility="Collapsed"
-                       IsHitTestVisible="True"
                       Panel.ZIndex="1001"
                       MouseLeftButtonDown="SelectionRectangle_MouseLeftButtonDown"
                       MouseLeftButtonUp="SelectionRectangle_MouseLeftButtonUp"