From 2a15bcf2c6e66e4f4a1d51af61e6fc5d945b3813 Mon Sep 17 00:00:00 2001
From: Open-KFC <1811593346@qq.com>
Date: Sat, 1 Mar 2025 19:06:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(MyScrollViewer):=20=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E8=87=B4=E4=BD=BF=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?ToolTip=E6=B0=B8=E8=BF=9C=E4=B8=8D=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Application.xaml           | 8 ++++++--
 Plain Craft Launcher 2/Application.xaml.vb        | 6 +++---
 Plain Craft Launcher 2/Controls/MyScrollViewer.vb | 5 ++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Plain Craft Launcher 2/Application.xaml b/Plain Craft Launcher 2/Application.xaml
index 02926d8..ab18b1d 100644
--- a/Plain Craft Launcher 2/Application.xaml	
+++ b/Plain Craft Launcher 2/Application.xaml	
@@ -137,10 +137,12 @@
 
             <!-- ToolTip -->
             <Style TargetType="ToolTip">
+                <EventSetter Event="Opened" Handler="OnTooltipOpened" />
+                <EventSetter Event="Closed" Handler="OnTooltipClosed" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Border Loaded="TooltipLoaded" Unloaded="TooltipUnloaded" BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1.5" CornerRadius="4" MaxWidth="500" Background="#E5FFFFFF" Margin="0,0,4,4" SnapsToDevicePixels="True">
+                            <Border BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1.5" CornerRadius="4" MaxWidth="500" Background="#E5FFFFFF" Margin="0,0,4,4" SnapsToDevicePixels="True">
                                 <Border.Effect>
                                     <DropShadowEffect Opacity="0.3" BlurRadius="4" ShadowDepth="2" Color="{DynamicResource ColorObject1}" />
                                 </Border.Effect>
@@ -151,10 +153,12 @@
                 </Setter>
             </Style>
             <Style x:Key="ExtendTextToolTip" TargetType="ToolTip">
+                <EventSetter Event="Opened" Handler="OnTooltipOpened" />
+                <EventSetter Event="Closed" Handler="OnTooltipClosed" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Border Loaded="TooltipLoaded" Unloaded="TooltipUnloaded" BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1" CornerRadius="3" Background="White" Margin="0,0,4,4" SnapsToDevicePixels="True">
+                            <Border BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1" CornerRadius="3" Background="White" Margin="0,0,4,4" SnapsToDevicePixels="True">
                                 <TextBlock Text="{TemplateBinding ContentControl.Content}" TextWrapping="Wrap" Foreground="{DynamicResource ColorBrush1}" Margin="7,5" FontSize="12"/>
                             </Border>
                         </ControlTemplate>
diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb
index 833d352..98edcbf 100644
--- a/Plain Craft Launcher 2/Application.xaml.vb	
+++ b/Plain Craft Launcher 2/Application.xaml.vb	
@@ -287,11 +287,11 @@ WaitRetry:
         End Select
     End Sub
 
-    Public Shared ShowingTooltips As New List(Of Border)
-    Private Sub TooltipLoaded(sender As Border, e As EventArgs)
+    Public Shared ShowingTooltips As New List(Of ToolTip)
+    Private Sub OnTooltipOpened(sender As ToolTip, e As RoutedEventArgs)
         ShowingTooltips.Add(sender)
     End Sub
-    Private Sub TooltipUnloaded(sender As Border, e As RoutedEventArgs)
+    Private Sub OnTooltipClosed(sender As ToolTip, e As RoutedEventArgs)
         ShowingTooltips.Remove(sender)
     End Sub
 
diff --git a/Plain Craft Launcher 2/Controls/MyScrollViewer.vb b/Plain Craft Launcher 2/Controls/MyScrollViewer.vb
index d3b0173..721d778 100644
--- a/Plain Craft Launcher 2/Controls/MyScrollViewer.vb	
+++ b/Plain Craft Launcher 2/Controls/MyScrollViewer.vb	
@@ -19,9 +19,8 @@
         e.Handled = True
         PerformVerticalOffsetDelta(-e.Delta)
         '关闭 Tooltip (#2552)
-        For Each TooltipBorder In Application.ShowingTooltips
-            AniStart(AaOpacity(TooltipBorder, -1, 100), $"Hide Tooltip {GetUuid()}")
-        Next
+        '通过 IsOpen 关闭 Tooltip 而不是降低 Border 不透明度 (#5744)
+        Application.ShowingTooltips.ForEach(Sub(tooltip) tooltip.IsOpen = False)
     End Sub
     Public Sub PerformVerticalOffsetDelta(Delta As Double)
         AniStart(