diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 2db08b1b2..d42fd425f 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -199,7 +199,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings } public bool LeaveCmdOpen { get; set; } public bool HideWhenDeactive { get; set; } = true; - public LauncherPositions LauncherPosition { get; set; } = LauncherPositions.MouseScreenCenter; + public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter; public bool IgnoreHotkeysOnFullscreen { get; set; } public HttpProxy Proxy { get; set; } = new HttpProxy(); @@ -225,7 +225,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings Light, Dark } - public enum LauncherPositions + public enum SearchWindowPositions { RememberLastLaunchLocation, MouseScreenCenter, diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index dd4cc3182..4a0841940 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -35,13 +35,13 @@ Error setting launch on startup Hide Flow Launcher when focus is lost Do not show new version notifications - Launcher Position + Search Window Position Remember last launch location - Remember Last Location - Mouse Focused Screen - Center - Mouse Focused Screen - Center Top - Mouse Focused Screen - Left Top - Mouse Focused Screen - Right Top + Remember Last Location + Mouse Focused Screen - Center + Mouse Focused Screen - Center Top + Mouse Focused Screen - Left Top + Mouse Focused Screen - Right Top Language Last Query Style Show/Hide previous results when Flow Launcher is reactivated. diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 32271ac9c..d605cf9c9 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -189,25 +189,25 @@ namespace Flow.Launcher private void InitializePosition() { - switch (_settings.LauncherPosition) + switch (_settings.SearchWindowPosition) { - case LauncherPositions.RememberLastLaunchLocation: + case SearchWindowPositions.RememberLastLaunchLocation: Top = _settings.WindowTop; Left = _settings.WindowLeft; break; - case LauncherPositions.MouseScreenCenter: + case SearchWindowPositions.MouseScreenCenter: Left = HorizonCenter(); Top = VerticalCenter(); break; - case LauncherPositions.MouseScreenCenterTop: + case SearchWindowPositions.MouseScreenCenterTop: Left = HorizonCenter(); Top = 10; break; - case LauncherPositions.MouseScreenLeftTop: + case SearchWindowPositions.MouseScreenLeftTop: Left = 10; Top = 10; break; - case LauncherPositions.MouseScreenRightTop: + case SearchWindowPositions.MouseScreenRightTop: Left = HorizonRight(); Top = 10; break; @@ -461,7 +461,7 @@ namespace Flow.Launcher { if (_animating) return; - if (_settings.LauncherPosition == LauncherPositions.RememberLastLaunchLocation) + if (_settings.SearchWindowPosition == SearchWindowPositions.RememberLastLaunchLocation) { _settings.WindowLeft = Left; _settings.WindowTop = Top; diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 65b659a5a..70523fc29 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -688,20 +688,20 @@ - + + SelectionChanged="SearchWindowPositionSelectedIndexChanged" /> diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index 42e7f7c34..105c6fbea 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -435,7 +435,7 @@ namespace Flow.Launcher pluginFilterTxb.Focus(); } - private void LauncherPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e) + private void SearchWindowPositionSelectedIndexChanged(object sender, SelectionChangedEventArgs e) { } diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index beb5e4c38..1ef1edeb9 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -387,23 +387,23 @@ namespace Flow.Launcher.ViewModel - public class LauncherPosition + public class SearchWindowPosition { public string Display { get; set; } - public LauncherPositions Value { get; set; } + public SearchWindowPositions Value { get; set; } } - public List LauncherPositions + public List SearchWindowPositions { get { - List modes = new List(); - var enums = (LauncherPositions[])Enum.GetValues(typeof(LauncherPositions)); + List modes = new List(); + var enums = (SearchWindowPositions[])Enum.GetValues(typeof(SearchWindowPositions)); foreach (var e in enums) { - var key = $"LauncherPosition{e}"; + var key = $"SearchWindowPosition{e}"; var display = _translater.GetTranslation(key); - var m = new LauncherPosition { Display = display, Value = e, }; + var m = new SearchWindowPosition { Display = display, Value = e, }; modes.Add(m); } return modes;