prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Change the if code to switch.

Browse source 
- Change String to enum.
- Remove duplicated code.
This commit is contained in:
DB p 2022-10-13 09:28:23 +09:00
parent 3c8acaa659
commit d1bfd1cc0f
2 changed files with 24 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file

@ -199,7 +199,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
}
public bool LeaveCmdOpen { get; set; }
public bool HideWhenDeactive { get; set; } = true;
public string LauncherPosition { get; set; } = "RememberLastLaunchLocation";
public LauncherPositions LauncherPosition { get; set; } = LauncherPositions.RememberLastLaunchLocation;
public bool IgnoreHotkeysOnFullscreen { get; set; }
public HttpProxy Proxy { get; set; } = new HttpProxy();

73
Flow.Launcher/MainWindow.xaml.cs
View file

@ -182,30 +182,28 @@ namespace Flow.Launcher
private void InitializePosition()
{
if (_settings.LauncherPosition == "RememberLastLaunchLocation")
switch (_settings.LauncherPosition)
{
Top = _settings.WindowTop;
Left = _settings.WindowLeft;
}
else if(_settings.LauncherPosition == "MouseScreenCenter")
{
Left = WindowLeft();
Top = WindowTop();
}
else if (_settings.LauncherPosition == "MouseScreenCenterTop")
{
Left = WindowLeft();
Top = 10;
}
else if (_settings.LauncherPosition == "MouseScreenLeftTop")
{
Left = 10;
Top = 10;
}
else if (_settings.LauncherPosition == "MouseScreenRightTop")
{
Left = WindowRight();
Top = 10;
case LauncherPositions.RememberLastLaunchLocation:
Top = _settings.WindowTop;
Left = _settings.WindowLeft;
break;
case LauncherPositions.MouseScreenCenter:
Left = WindowLeft();
Top = WindowTop();
break;
case LauncherPositions.MouseScreenCenterTop:
Left = WindowLeft();
Top = 10;
break;
case LauncherPositions.MouseScreenLeftTop:
Left = 10;
Top = 10;
break;
case LauncherPositions.MouseScreenRightTop:
Left = WindowRight();
Top = 10;
break;
}
}
@ -445,39 +443,14 @@ namespace Flow.Launcher
{
if (_animating)
return;
if (_settings.LauncherPosition == "RememberLastLaunchLocation")
{
Left = _settings.WindowLeft;
Top = _settings.WindowTop;
}
else if (_settings.LauncherPosition == "MouseScreenCenter")
{
Left = WindowLeft();
Top = WindowTop();
}
else if (_settings.LauncherPosition == "MouseScreenCenterTop")
{
Left = WindowLeft();
Top = 10;
}
else if (_settings.LauncherPosition == "MouseScreenLeftTop")
{
Left = 10;
Top = 10;
}
else if (_settings.LauncherPosition == "MouseScreenRightTop")
{
Left = WindowRight();
Top = 10;
}
InitializePosition();
}
private void OnLocationChanged(object sender, EventArgs e)
{
if (_animating)
return;
if (_settings.LauncherPosition == "RememberLastLaunchLocation")
if (_settings.LauncherPosition == LauncherPositions.RememberLastLaunchLocation)
{
_settings.WindowLeft = Left;
_settings.WindowTop = Top;