github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 05:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: sub-window's startup location (#2100)

Browse Source 
Child window will use current actived window (fall back to `MainWindow`) to calculate the startup location (likes `CenterScreen` mode). The benefits of doing this are:

- Solve the problem that newly opened windows always appear on the primary screen in multi-screen situations.
- Newly opened windows always display on the currently used screen. This reduces the need for users to move the mouse.

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-02-05 18:28:37 +08:00
parent 2cde92712a
commit f1af23cbb3
1 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/App.axaml.cs
View File

@@ -148,18 +148,52 @@ namespace SourceGit
public static void ShowWindow(object data)
{
if (data is Views.ChromelessWindow window)
if (data is not Views.ChromelessWindow window)
{
window.Show();
return;
window = CreateViewForViewModel(data) as Views.ChromelessWindow;
if (window == null)
return;
window.DataContext = data;
}
window = CreateViewForViewModel(data) as Views.ChromelessWindow;
if (window != null)
do
{
window.DataContext = data;
window.Show();
}
if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { Windows: { Count: > 0 } windows })
{
// Try to find the actived window (fall back to `MainWindow`)
Window actived = windows[0];
if (!actived.IsActive)
{
for (var i = 1; i < windows.Count; i++)
{
var test = windows[i];
if (test.IsActive)
{
actived = test;
break;
}
}
}
// Get the screen where current window locates.
var screen = actived.Screens.ScreenFromWindow(actived) ?? actived.Screens.Primary;
if (screen == null)
break;
// Calculate the startup position (Center Screen Mode) of target window
var rect = new PixelRect(PixelSize.FromSize(window.ClientSize, actived.DesktopScaling));
var centeredRect = screen.WorkingArea.CenterRect(rect);
if (actived.Screens.ScreenFromPoint(centeredRect.Position) == null)
break;
// Use the startup position
window.WindowStartupLocation = WindowStartupLocation.Manual;
window.Position = centeredRect.Position;
}
} while (false);
window.Show();
}
public static async Task<bool> AskConfirmAsync(string message, Models.ConfirmButtonType buttonType = Models.ConfirmButtonType.OkCancel)