Minor

rampaa · Dec 14, 2024 · 021ba31 · 021ba31
1 parent ad5b544
commit 021ba31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/JL.Windows/GUI/MainWindow.xaml.cs b/JL.Windows/GUI/MainWindow.xaml.cs
@@ -312,7 +312,7 @@ public Task HandleMouseMove(MouseEventArgs? e)
                || (!configManager.TextBoxIsReadOnly && InputMethod.Current?.ImeState is InputMethodState.On)
                || (configManager.RequireLookupKeyPress && !configManager.LookupKeyKeyGesture.IsPressed())
             ? Task.CompletedTask
-            : FirstPopupWindow.LookupOnMouseMoveOrClick(MainTextBox);
+            : FirstPopupWindow.LookupOnMouseMoveOrClick(MainTextBox, false);
     }
 
     // ReSharper disable once AsyncVoidMethod
@@ -1136,7 +1136,7 @@ private async void MainTextBox_PreviewMouseUp(object? sender, MouseButtonEventAr
 
         else
         {
-            await FirstPopupWindow.LookupOnMouseMoveOrClick(MainTextBox).ConfigureAwait(false);
+            await FirstPopupWindow.LookupOnMouseMoveOrClick(MainTextBox, true).ConfigureAwait(false);
         }
     }
 

diff --git a/JL.Windows/GUI/PopupWindow.xaml.cs b/JL.Windows/GUI/PopupWindow.xaml.cs
@@ -306,22 +306,21 @@ public Task LookupOnCharPosition(TextBox textBox, int charPosition, bool enableM
         return Task.CompletedTask;
     }
 
-    public Task LookupOnMouseMoveOrClick(TextBox textBox)
+    public Task LookupOnMouseMoveOrClick(TextBox textBox, bool enableMiningMode)
     {
         int charPosition = textBox.GetCharacterIndexFromPoint(Mouse.GetPosition(textBox), false);
-
-        if (charPosition >= 0)
+        if (charPosition < 0)
         {
-            if (charPosition > 0 && char.IsHighSurrogate(textBox.Text[charPosition - 1]))
-            {
-                --charPosition;
-            }
+            HidePopup();
+            return Task.CompletedTask;
+        }
 
-            return LookupOnCharPosition(textBox, charPosition, ConfigManager.Instance.LookupOnMouseClickOnly);
+        if (charPosition > 0 && char.IsHighSurrogate(textBox.Text[charPosition - 1]))
+        {
+            --charPosition;
         }
 
-        HidePopup();
-        return Task.CompletedTask;
+        return LookupOnCharPosition(textBox, charPosition, enableMiningMode);
     }
 
     public Task LookupOnSelect(TextBox textBox)
@@ -1206,7 +1205,7 @@ private Task HandleTextBoxMouseMove(TextBox textBox, MouseEventArgs? e)
             _lastInteractedTextBox = textBox;
             if (JapaneseUtils.JapaneseRegex().IsMatch(textBox.Text))
             {
-                return ChildPopupWindow.LookupOnMouseMoveOrClick(textBox);
+                return ChildPopupWindow.LookupOnMouseMoveOrClick(textBox, false);
             }
 
             if (configManager.HighlightLongestMatch)
@@ -1818,7 +1817,7 @@ private async void TextBox_PreviewMouseUp(object sender, MouseButtonEventArgs e)
 
         else
         {
-            await ChildPopupWindow.LookupOnMouseMoveOrClick((TextBox)sender).ConfigureAwait(false);
+            await ChildPopupWindow.LookupOnMouseMoveOrClick((TextBox)sender, true).ConfigureAwait(false);
         }
     }