Skip to content

fix: handle tray width on scaled systems #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2025
Merged

fix: handle tray width on scaled systems #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions App/TrayWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ private void ResizeWindow()
// Adjust the AppWindow size
var scale = GetDisplayScale();
var height = (int)(desiredSize.Height * scale);
AppWindow.Resize(new SizeInt32(WIDTH, height));
var width = (int)(WIDTH * scale);
AppWindow.Resize(new SizeInt32(width, height));
}

private double GetDisplayScale()
Expand Down Expand Up @@ -232,12 +233,13 @@ private void MoveWindow()
private PointInt32 GetWindowPosition()
{
var height = AppWindow.Size.Height;
var width = AppWindow.Size.Width;
var cursorPosition = _lastActivatePosition;
if (cursorPosition is null)
{
var primaryWorkArea = DisplayArea.Primary.WorkArea;
return new PointInt32(
primaryWorkArea.Width - WIDTH,
primaryWorkArea.Width - width,
primaryWorkArea.Height - height
);
}
Expand All @@ -252,7 +254,7 @@ private PointInt32 GetWindowPosition()
).WorkArea;

// Adjust if the window goes off the right edge of the display.
if (x + WIDTH > workArea.X + workArea.Width) x = workArea.X + workArea.Width - WIDTH;
if (x + width > workArea.X + workArea.Width) x = workArea.X + workArea.Width - width;

// Adjust if the window goes off the bottom edge of the display.
if (y + height > workArea.Y + workArea.Height) y = workArea.Y + workArea.Height - height;
Expand Down