Skip to content

Commit 08357a8

Browse files
SlimeNullSlimeNull
committed
feat: 位置跟随鼠标
1 parent 624c936 commit 08357a8

14 files changed

+122
-64
lines changed

‎src/CurvaLauncher/AppConfig.cs

+4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public partial class AppConfig : ObservableObject
3636
[ObservableProperty]
3737
private AppLanguage _language = AppLanguage.Auto;
3838

39+
[ObservableProperty]
40+
private WindowStartupScreen _windowStartupScreen = WindowStartupScreen.PrimaryScreen;
41+
3942
[ObservableProperty]
4043
private ObservableCollection<QueryHotkey> _customQueryHotkeys = new()
4144
{
@@ -56,6 +59,7 @@ public partial class AppConfig : ObservableObject
5659

5760
public static IReadOnlyCollection<AppTheme> AvailableThemes { get; } = [AppTheme.Auto, AppTheme.Light, AppTheme.Dark];
5861
public static IReadOnlyCollection<AppLanguage> AvailableLanguages { get; } = Enum.GetValues<AppLanguage>();
62+
public static IReadOnlyCollection<WindowStartupScreen> AvailableWindowStartupScreens { get; } = Enum.GetValues<WindowStartupScreen>();
5963

6064

6165
public partial class PluginConfig : ObservableObject

‎src/CurvaLauncher/CurvaLauncher - Backup.csproj

-51
This file was deleted.

‎src/CurvaLauncher/I18n/De.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<sys:String x:Key="StrCheck">Überprüfen</sys:String>
1414
<sys:String x:Key="StrTips">Tipps</sys:String>
1515
<sys:String x:Key="StrApply">Übernehmen</sys:String>
16+
<sys:String x:Key="StrOK">OK</sys:String>
1617
<sys:String x:Key="StrSave">Speichern</sys:String>
1718
<sys:String x:Key="StrGeneral">Allgemein</sys:String>
1819
<sys:String x:Key="StrPlugin">Plugin</sys:String>
@@ -31,6 +32,7 @@
3132

3233
<!--SettingsGeneralPage-->
3334
<sys:String x:Key="StrLauncherHotkey">Tastenkombination für Launcher</sys:String>
35+
<sys:String x:Key="StrWindowStartupScreen">Startbildschirm des Fensters</sys:String>
3436
<sys:String x:Key="StrNotRegistered">Nicht registriert</sys:String>
3537
<sys:String x:Key="StrInvalidHotkey">Ungültige Tastenkombination</sys:String>
3638
<sys:String x:Key="StrLauncherWidth">Breite des Launchers</sys:String>

‎src/CurvaLauncher/I18n/EnUs.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<sys:String x:Key="StrCheck">Check</sys:String>
1414
<sys:String x:Key="StrTips">Tips</sys:String>
1515
<sys:String x:Key="StrApply">Apply</sys:String>
16+
<sys:String x:Key="StrOK">OK</sys:String>
1617
<sys:String x:Key="StrSave">Save</sys:String>
1718
<sys:String x:Key="StrGeneral">General</sys:String>
1819
<sys:String x:Key="StrPlugin">Plugin</sys:String>
@@ -31,6 +32,7 @@
3132

3233
<!--SettingsGeneralPage-->
3334
<sys:String x:Key="StrLauncherHotkey">Launcher hotkey</sys:String>
35+
<sys:String x:Key="StrWindowStartupScreen">Window startup screen</sys:String>
3436
<sys:String x:Key="StrNotRegistered">Not registered</sys:String>
3537
<sys:String x:Key="StrInvalidHotkey">Invalid hotkey</sys:String>
3638
<sys:String x:Key="StrLauncherWidth">Launcher width</sys:String>

‎src/CurvaLauncher/I18n/JaJp.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<sys:String x:Key="StrCheck">チェック</sys:String>
1313
<sys:String x:Key="StrTips">ヒント</sys:String>
1414
<sys:String x:Key="StrApply">適用</sys:String>
15+
<sys:String x:Key="StrOK">OK</sys:String>
1516
<sys:String x:Key="StrSave">保存</sys:String>
1617
<sys:String x:Key="StrGeneral">一般</sys:String>
1718
<sys:String x:Key="StrPlugin">プラグイン</sys:String>
@@ -26,6 +27,7 @@
2627
<sys:String x:Key="StrExitLauncher">ランチャーを終了する</sys:String>
2728

2829
<sys:String x:Key="StrLauncherHotkey">ランチャーホットキー</sys:String>
30+
<sys:String x:Key="StrWindowStartupScreen">ウィンドウの起動画面</sys:String>
2931
<sys:String x:Key="StrNotRegistered">登録されていません</sys:String>
3032
<sys:String x:Key="StrInvalidHotkey">無効なホットキー</sys:String>
3133
<sys:String x:Key="StrLauncherWidth">ランチャーの幅</sys:String>

‎src/CurvaLauncher/I18n/ZhHans.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<sys:String x:Key="StrCheck">检查</sys:String>
1414
<sys:String x:Key="StrTips">提示</sys:String>
1515
<sys:String x:Key="StrApply">应用</sys:String>
16+
<sys:String x:Key="StrOK">确定</sys:String>
1617
<sys:String x:Key="StrSave">保存</sys:String>
1718
<sys:String x:Key="StrGeneral">常规</sys:String>
1819
<sys:String x:Key="StrPlugin">插件</sys:String>
@@ -31,6 +32,7 @@
3132

3233
<!--SettingsGeneralPage-->
3334
<sys:String x:Key="StrLauncherHotkey">启动器热键</sys:String>
35+
<sys:String x:Key="StrWindowStartupScreen">窗口启动屏幕</sys:String>
3436
<sys:String x:Key="StrNotRegistered">未注册</sys:String>
3537
<sys:String x:Key="StrInvalidHotkey">无效热键</sys:String>
3638
<sys:String x:Key="StrLauncherWidth">启动器宽度</sys:String>

‎src/CurvaLauncher/I18n/ZhHant.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<sys:String x:Key="StrCheck">檢查</sys:String>
1313
<sys:String x:Key="StrTips">提示</sys:String>
1414
<sys:String x:Key="StrApply">套用</sys:String>
15+
<sys:String x:Key="StrOK">確定</sys:String>
1516
<sys:String x:Key="StrSave">儲存</sys:String>
1617
<sys:String x:Key="StrGeneral">常規</sys:String>
1718
<sys:String x:Key="StrPlugin">插件</sys:String>
@@ -26,6 +27,7 @@
2627
<sys:String x:Key="StrExitLauncher">退出啟動器</sys:String>
2728

2829
<sys:String x:Key="StrLauncherHotkey">啟動器熱鍵</sys:String>
30+
<sys:String x:Key="StrWindowStartupScreen">視窗啟動畫面</sys:String>
2931
<sys:String x:Key="StrNotRegistered">未註冊</sys:String>
3032
<sys:String x:Key="StrInvalidHotkey">無效熱鍵</sys:String>
3133
<sys:String x:Key="StrLauncherWidth">啟動器寬度</sys:String>

‎src/CurvaLauncher/MainWindow.xaml.cs

+47-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
using System.Windows;
33
using System.Windows.Controls;
44
using System.Windows.Input;
5+
using System.Windows.Interop;
6+
using System.Windows.Media;
57
using CommunityToolkit.Mvvm.ComponentModel;
68
using CommunityToolkit.Mvvm.Input;
79
using CurvaLauncher.Models;
810
using CurvaLauncher.Services;
11+
using CurvaLauncher.Utilities;
912
using CurvaLauncher.ViewModels;
1013
using Wpf.Ui.Appearance;
1114

@@ -17,6 +20,8 @@ namespace CurvaLauncher;
1720
[ObservableObject]
1821
public partial class MainWindow : Wpf.Ui.Controls.UiWindow
1922
{
23+
private bool _firstShow = true;
24+
2025
public MainWindow(
2126
MainViewModel viewModel,
2227
ConfigService configService)
@@ -31,13 +36,46 @@ public MainWindow(
3136
public AppConfig AppConfig { get; }
3237
public MainViewModel ViewModel { get; }
3338

39+
private void InitializeWindowRect()
40+
{
41+
var targetScreen = System.Windows.Forms.Screen.PrimaryScreen;
42+
43+
if (AppConfig.WindowStartupScreen == WindowStartupScreen.ScreenWithMouse)
44+
{
45+
var drawingMousePosition = System.Windows.Forms.Control.MousePosition;
46+
47+
foreach (var screen in System.Windows.Forms.Screen.AllScreens)
48+
{
49+
if (screen.WorkingArea.Contains(drawingMousePosition))
50+
{
51+
targetScreen = screen;
52+
break;
53+
}
54+
}
55+
}
56+
57+
if (targetScreen is null)
58+
{
59+
return;
60+
}
61+
62+
var windowInteropHelper = new WindowInteropHelper(this);
63+
var pixelLauncherWidth = (int)(AppConfig.LauncherWidth * VisualTreeHelper.GetDpi(this).DpiScaleX);
64+
65+
NativeMethods.GetWindowRect(windowInteropHelper.Handle, out var windowRect);
66+
NativeMethods.SetWindowPos(windowInteropHelper.Handle, 0,
67+
targetScreen.WorkingArea.Left + (targetScreen.WorkingArea.Width - pixelLauncherWidth) / 2,
68+
targetScreen.WorkingArea.Top + (targetScreen.WorkingArea.Height / 4),
69+
pixelLauncherWidth,
70+
windowRect.Height,
71+
0x0001);
72+
}
73+
3474
private void WindowLoaded(object sender, RoutedEventArgs e)
3575
{
3676
Wpf.Ui.Appearance.Watcher.Watch(this, BackgroundType.Mica, true);
3777

38-
Width = AppConfig.LauncherWidth;
39-
Left = (SystemParameters.PrimaryScreenWidth - AppConfig.LauncherWidth) / 2;
40-
Top = SystemParameters.PrimaryScreenHeight / 4;
78+
InitializeWindowRect();
4179
}
4280

4381
private void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
@@ -120,7 +158,13 @@ private void WindowIsVisibleChanged(object sender, DependencyPropertyChangedEven
120158
{
121159
if (IsVisible)
122160
{
161+
if (!_firstShow)
162+
{
163+
InitializeWindowRect();
164+
}
165+
123166
ViewModel.QueryCommand.Execute(null);
167+
_firstShow = false;
124168
}
125169
}
126170
}

‎src/CurvaLauncher/Models/WindowStartupScreen.cs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace CurvaLauncher.Models;
2+
3+
public enum WindowStartupScreen
4+
{
5+
PrimaryScreen,
6+
ScreenWithMouse
7+
}

‎src/CurvaLauncher/Utilities/NativeMethods.cs

+22-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Runtime.InteropServices;
3+
using System.Windows;
34

45
namespace CurvaLauncher.Utilities;
56

@@ -35,7 +36,7 @@ public enum DwmWindowAttribute : uint
3536
}
3637

3738
[DllImport("dwmapi.dll", PreserveSig = true)]
38-
public static extern int DwmSetWindowAttribute(IntPtr hwnd, DwmWindowAttribute attr, ref int attrValue, int attrSize);
39+
public static extern int DwmSetWindowAttribute(IntPtr hWnd, DwmWindowAttribute attr, ref int attrValue, int attrSize);
3940

4041
public static bool EnableDarkModeForWindow(IntPtr hWnd, bool enable)
4142
{
@@ -45,9 +46,15 @@ public static bool EnableDarkModeForWindow(IntPtr hWnd, bool enable)
4546
}
4647

4748

48-
[DllImport("User32.dll", EntryPoint = "MessageBoxW",
49-
ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
50-
public extern static MessageBoxResult MessageBox(IntPtr hwnd, string text, string caption, MessageBoxFlags flags);
49+
[DllImport("User32.dll", EntryPoint = "MessageBoxW", ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
50+
public extern static MessageBoxResult MessageBox(IntPtr hWnd, string text, string caption, MessageBoxFlags flags);
51+
52+
53+
[DllImport("User32.dll", EntryPoint = "GetWindowRect", ExactSpelling = true)]
54+
public extern static bool GetWindowRect(IntPtr hWnd, out Rect rect);
55+
56+
[DllImport("User32.dll", EntryPoint = "SetWindowPos", ExactSpelling = true)]
57+
public extern static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint flags);
5158
}
5259

5360
public enum MessageBoxResult : int
@@ -101,4 +108,15 @@ public enum MessageBoxFlags : uint
101108
SetForeground = 0x10000,
102109
Topmost = 0x40000,
103110
ServiceNotification = 0x200000,
111+
}
112+
113+
public struct Rect
114+
{
115+
public int Left;
116+
public int Top;
117+
public int Right;
118+
public int Bottom;
119+
120+
public int Width => Right - Left;
121+
public int Height => Bottom - Top;
104122
}

‎src/CurvaLauncher/Views/Pages/SettingsGeneralPage.xaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
xmlns:converters="clr-namespace:CurvaLauncher.Converters"
1212
xmlns:utils="clr-namespace:CurvaLauncher.Utilities"
1313
mc:Ignorable="d"
14-
d:DesignHeight="450" d:DesignWidth="800"
14+
d:DesignHeight="850" d:DesignWidth="800"
1515
d:Background="White"
1616
d:DataContext="{d:DesignInstance Type=local:SettingsGeneralPage,IsDesignTimeCreatable=False}"
1717
Title="SettingsGeneralPage">
@@ -163,6 +163,25 @@
163163
</ComboBox>
164164
</StackPanel>
165165

166+
<StackPanel Margin="0 0 0 20">
167+
<Label FontSize="14"
168+
Foreground="{DynamicResource TextFillColorPrimaryBrush}">
169+
<TextBlock>
170+
<Run Text="{DynamicResource StrWindowStartupScreen}"/>
171+
<Run Text=":"/>
172+
</TextBlock>
173+
</Label>
174+
<ComboBox VerticalContentAlignment="Center"
175+
ItemsSource="{x:Static root:AppConfig.AvailableWindowStartupScreens}"
176+
SelectedItem="{Binding ConfigService.Config.WindowStartupScreen}">
177+
<ComboBox.ItemTemplate>
178+
<DataTemplate DataType="models:WindowStartupScreen">
179+
<TextBlock Text="{Binding Converter={StaticResource enum2str}}"/>
180+
</DataTemplate>
181+
</ComboBox.ItemTemplate>
182+
</ComboBox>
183+
</StackPanel>
184+
166185
<CheckBox Margin="0 5 0 0"
167186
IsChecked="{Binding ConfigService.Config.StartsWithWindows}">
168187

‎src/CurvaLauncher/Views/SettingsWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</Style>
3939
</StackPanel.Resources>
4040
<ui:Button Content="{DynamicResource StrExitLauncher}" Command="{x:Static root:App.ShutdownCommand}"/>
41-
<ui:Button Content="{DynamicResource StrSave}" Command="{Binding SaveSettingsCommand}" Appearance="Primary"/>
41+
<ui:Button Content="{DynamicResource StrOK}" Command="{Binding ApplyAndCloseSettingsCommand}" Appearance="Primary"/>
4242
</StackPanel>
4343
</Border>
4444

‎src/CurvaLauncher/Views/SettingsWindow.xaml.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,19 @@ private void NavigationStoreLoaded(object sender, RoutedEventArgs e)
6767
[RelayCommand]
6868
public void CloseSettings()
6969
{
70-
Hide();
70+
Close();
7171
}
7272

7373
[RelayCommand]
74-
public void SaveSettings()
74+
public void ApplySettings()
7575
{
7676
ConfigService.Save();
7777
}
78+
79+
[RelayCommand]
80+
public void ApplyAndCloseSettings()
81+
{
82+
ConfigService.Save();
83+
Close();
84+
}
7885
}

‎src/CurvaLauncher/app.manifest

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@
5151
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
5252
5353
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
54-
<!--
54+
5555
<application xmlns="urn:schemas-microsoft-com:asm.v3">
5656
<windowsSettings>
5757
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
5858
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
5959
</windowsSettings>
6060
</application>
61-
-->
61+
6262

6363
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
6464

0 commit comments

Comments
 (0)