2.13.0.1

2026-07-03 15:07:59 +08:00
parent c6d0457946
commit 5b05f87067
10 changed files with 40 additions and 24 deletions
@@ -11,7 +11,8 @@ Public Class MyScrollViewer
                (GetType(ComboBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, ComboBox).IsDropDownOpen) OrElse
                (GetType(TextBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, TextBox).AcceptsReturn) OrElse
                GetType(ComboBoxItem).IsAssignableFrom(SourceType) OrElse
-                PresentationSource.FromVisual(e.Source)?.RootVisual?.GetType().FullName = "System.Windows.Controls.Primitives.PopupRoot") Then
+                (TypeOf e.Source Is Visual AndAlso
+                    PresentationSource.FromVisual(e.Source)?.RootVisual?.GetType().FullName = "System.Windows.Controls.Primitives.PopupRoot")) Then
            '如果当前是在对有滚动条的下拉框或文本框执行，则不接管操作
            Return
        End If