Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions Flow.Launcher/SettingWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,37 @@ private void Window_StateChanged(object sender, EventArgs e)

public void InitializePosition()
{
if (_settings.SettingWindowTop == null || _settings.SettingWindowLeft == null)
var previousTop = _settings.SettingWindowTop;
var previousLeft = _settings.SettingWindowLeft;

if (previousTop == null || previousLeft == null || !IsPositionValid(previousTop.Value, previousLeft.Value))
{
Top = WindowTop();
Left = WindowLeft();
}
else
{
Top = _settings.SettingWindowTop.Value;
Left = _settings.SettingWindowLeft.Value;
Top = previousTop.Value;
Left = previousLeft.Value;
}
WindowState = _settings.SettingWindowState;
}

private bool IsPositionValid(double top, double left)
{
foreach (var screen in Screen.AllScreens)
{
var workingArea = screen.WorkingArea;

if (left >= workingArea.Left && left < workingArea.Right &&
top >= workingArea.Top && top < workingArea.Bottom)
{
return true;
}
}
return false;
}

private double WindowLeft()
{
var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
Expand Down