Minor

rampaa · Nov 18, 2024 · ec8c074 · ec8c074
1 parent fd8c366
commit ec8c074
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 25 deletions.
diff --git a/JL.Windows/ConfigManager.cs b/JL.Windows/ConfigManager.cs
@@ -12,6 +12,7 @@
 using JL.Windows.GUI;
 using JL.Windows.Utilities;
 using Microsoft.Data.Sqlite;
+using Rectangle = System.Drawing.Rectangle;
 
 namespace JL.Windows;
 
@@ -925,7 +926,7 @@ public void LoadPreferenceWindow(PreferencesWindow preferenceWindow)
             preferenceWindow.PopupFontComboBox.SelectedIndex = 0;
         }
 
-        System.Drawing.Rectangle bounds = WindowsUtils.ActiveScreen.Bounds;
+        Rectangle bounds = WindowsUtils.ActiveScreen.Bounds;
         preferenceWindow.PopupMaxHeightNumericUpDown.Maximum = bounds.Height;
         preferenceWindow.PopupMaxWidthNumericUpDown.Maximum = bounds.Width;
 
@@ -1440,7 +1441,7 @@ public void SaveBeforeClosing()
             : mainWindow.MinWidth;
         ConfigDBManager.UpdateSetting(connection, nameof(MainWindowWidth), mainWindowWidth.ToString(CultureInfo.InvariantCulture));
 
-        System.Drawing.Rectangle bounds = WindowsUtils.ActiveScreen.Bounds;
+        Rectangle bounds = WindowsUtils.ActiveScreen.Bounds;
         DpiScale dpi = WindowsUtils.Dpi;
         double mainWindowTopPosition = mainWindow.Top >= SystemParameters.VirtualScreenTop
             ? mainWindow.Top + mainWindow.Height <= SystemParameters.VirtualScreenTop + SystemParameters.VirtualScreenHeight

diff --git a/JL.Windows/GUI/AddDictionaryWindow.xaml.cs b/JL.Windows/GUI/AddDictionaryWindow.xaml.cs
@@ -7,7 +7,6 @@
 using JL.Core.Utilities;
 using JL.Windows.GUI.UserControls;
 using Microsoft.Win32;
-using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 using Path = System.IO.Path;
 
 namespace JL.Windows.GUI;

diff --git a/JL.Windows/GUI/MainWindow.xaml.cs b/JL.Windows/GUI/MainWindow.xaml.cs
@@ -3,7 +3,6 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -19,12 +18,8 @@
 using JL.Windows.Utilities;
 using Microsoft.Data.Sqlite;
 using Microsoft.Win32;
-using Clipboard = System.Windows.Clipboard;
-using Cursors = System.Windows.Input.Cursors;
-using DpiChangedEventArgs = System.Windows.DpiChangedEventArgs;
-using KeyEventArgs = System.Windows.Input.KeyEventArgs;
-using MouseEventArgs = System.Windows.Input.MouseEventArgs;
 using Rectangle = System.Drawing.Rectangle;
+using Screen = System.Windows.Forms.Screen;
 
 namespace JL.Windows.GUI;
 

diff --git a/JL.Windows/GUI/ManageDictionariesWindow.xaml.cs b/JL.Windows/GUI/ManageDictionariesWindow.xaml.cs
@@ -11,9 +11,6 @@
 using JL.Core.Dicts;
 using JL.Core.Utilities;
 using JL.Windows.Utilities;
-using Button = System.Windows.Controls.Button;
-using CheckBox = System.Windows.Controls.CheckBox;
-using Cursors = System.Windows.Input.Cursors;
 
 namespace JL.Windows.GUI;
 

diff --git a/JL.Windows/GUI/PreferencesWindow.xaml.cs b/JL.Windows/GUI/PreferencesWindow.xaml.cs
@@ -13,9 +13,6 @@
 using JL.Core.Utilities;
 using JL.Windows.Utilities;
 using Microsoft.Data.Sqlite;
-using Button = System.Windows.Controls.Button;
-using KeyEventArgs = System.Windows.Input.KeyEventArgs;
-using TextBox = System.Windows.Controls.TextBox;
 
 namespace JL.Windows.GUI;
 

diff --git a/JL.Windows/GUI/ReadingSelectionWindow.xaml.cs b/JL.Windows/GUI/ReadingSelectionWindow.xaml.cs
@@ -3,6 +3,7 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using JL.Windows.Utilities;
+using Rectangle = System.Drawing.Rectangle;
 
 namespace JL.Windows.GUI;
 
@@ -83,7 +84,7 @@ private void UpdatePosition(Point cursorPosition)
         double dpiAwareXOffSet = 5 * dpi.DpiScaleX;
         double dpiAwareYOffset = 15 * dpi.DpiScaleY;
 
-        System.Drawing.Rectangle bounds = WindowsUtils.ActiveScreen.Bounds;
+        Rectangle bounds = WindowsUtils.ActiveScreen.Bounds;
         bool needsFlipX = mouseX + currentWidth > bounds.Right;
         bool needsFlipY = mouseY + currentHeight > bounds.Bottom;
 

diff --git a/JL.Windows/Utilities/WindowsUtils.cs b/JL.Windows/Utilities/WindowsUtils.cs
@@ -8,11 +8,9 @@
 using System.Web;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Forms;
 using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControl.Tools;
 using JL.Core.Audio;
@@ -26,13 +24,8 @@
 using JL.Windows.SpeechSynthesis;
 using NAudio.Vorbis;
 using NAudio.Wave;
-using Application = System.Windows.Application;
-using Button = System.Windows.Controls.Button;
-using Clipboard = System.Windows.Clipboard;
-using FlowDirection = System.Windows.FlowDirection;
-using PopupWindow = JL.Windows.GUI.PopupWindow;
-using TextBox = System.Windows.Controls.TextBox;
-using Window = System.Windows.Window;
+using ColorPicker = HandyControl.Controls.ColorPicker;
+using Screen = System.Windows.Forms.Screen;
 
 namespace JL.Windows.Utilities;