diff --git a/Wox/Helper/WindowIntelopHelper.cs b/Wox/Helper/WindowsInteropHelper.cs similarity index 99% rename from Wox/Helper/WindowIntelopHelper.cs rename to Wox/Helper/WindowsInteropHelper.cs index f4c34805b1..462047886d 100644 --- a/Wox/Helper/WindowIntelopHelper.cs +++ b/Wox/Helper/WindowsInteropHelper.cs @@ -10,7 +10,7 @@ using Point = System.Windows.Point; namespace Wox.Helper { - public class WindowIntelopHelper + public class WindowsInteropHelper { private const int GWL_STYLE = -16; //WPF's Message code for Title Bar's Style private const int WS_SYSMENU = 0x80000; //WPF's Message code for System Menu diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index 0110e87339..b9b376a13f 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -54,7 +54,7 @@ namespace Wox private void OnLoaded(object sender, RoutedEventArgs _) { - WindowIntelopHelper.DisableControlBox(this); + WindowsInteropHelper.DisableControlBox(this); ThemeManager.Instance.ChangeTheme(_settings.Theme); InitProgressbarAnimation(); @@ -200,8 +200,8 @@ namespace Wox private double WindowLeft() { var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position); - var dip1 = WindowIntelopHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0); - var dip2 = WindowIntelopHelper.TransformPixelsToDIP(this, screen.WorkingArea.Width, 0); + var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0); + var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.Width, 0); var left = (dip2.X - ActualWidth) / 2 + dip1.X; return left; } @@ -209,8 +209,8 @@ namespace Wox private double WindowTop() { var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position); - var dip1 = WindowIntelopHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y); - var dip2 = WindowIntelopHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Height); + var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y); + var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Height); var top = (dip2.Y - QueryTextBox.ActualHeight) / 4 + dip1.Y; return top; } diff --git a/Wox/Msg.xaml.cs b/Wox/Msg.xaml.cs index b47bfba53b..70cf320d44 100644 --- a/Wox/Msg.xaml.cs +++ b/Wox/Msg.xaml.cs @@ -20,7 +20,7 @@ namespace Wox { InitializeComponent(); var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position); - var dipWorkingArea = WindowIntelopHelper.TransformPixelsToDIP(this, + var dipWorkingArea = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.Width, screen.WorkingArea.Height); Left = dipWorkingArea.X - Width; diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs index 8cc43084c8..526052f539 100644 --- a/Wox/ViewModel/MainViewModel.cs +++ b/Wox/ViewModel/MainViewModel.cs @@ -544,7 +544,7 @@ namespace Wox.ViewModel { //double if to omit calling win32 function if (_settings.IgnoreHotkeysOnFullscreen) - if (WindowIntelopHelper.IsWindowFullscreen()) + if (WindowsInteropHelper.IsWindowFullscreen()) return true; return false; diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 6d6cedbd58..3749bfc1e1 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -187,7 +187,7 @@ - + CustomQueryHotkeySetting.xaml