dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-01 09:24:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: rewrite workspace switcher (#1267)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-17 20:14:09 +08:00
parent bd553405c2
commit 4c1ba717a7
No known key found for this signature in database
10 changed files with 287 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/Views/Launcher.axaml.cs
View file

@ -157,6 +157,12 @@ namespace SourceGit.Views
if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
{
if (e.Key == Key.P)
{
vm.OpenWorkspaceSwitcher();
e.Handled = true;
}
if (e.Key == Key.W)
{
vm.CloseTab(null);
@ -248,17 +254,10 @@ namespace SourceGit.Views
}
}
}
else if (e.KeyModifiers.HasFlag(KeyModifiers.Alt))
{
if (SwitchWorkspace(e.Key))
{
e.Handled = true;
return;
}
}
else if (e.Key == Key.Escape)
{
vm.ActivePage.CancelPopup();
vm.CancelWorkspaceSwitcher();
e.Handled = true;
return;
}
@ -314,44 +313,6 @@ namespace SourceGit.Views
e.Handled = true;
}
private bool SwitchWorkspace(Key eKey)
{
var exec = (ViewModels.Launcher l, int idx) =>
{
var pref = ViewModels.Preferences.Instance;
if (idx < pref.Workspaces.Count)
l.SwitchWorkspace(pref.Workspaces[idx]);
return true; // Alt+1..9 (or Option+1..9) always mark handled
};
if (DataContext is ViewModels.Launcher launcher)
{
switch (eKey)
{
case Key.D1 or Key.NumPad1:
return exec(launcher, 0);
case Key.D2 or Key.NumPad2:
return exec(launcher, 1);
case Key.D3 or Key.NumPad3:
return exec(launcher, 2);
case Key.D4 or Key.NumPad4:
return exec(launcher, 3);
case Key.D5 or Key.NumPad5:
return exec(launcher, 4);
case Key.D6 or Key.NumPad6:
return exec(launcher, 5);
case Key.D7 or Key.NumPad7:
return exec(launcher, 6);
case Key.D8 or Key.NumPad8:
return exec(launcher, 7);
case Key.D9 or Key.NumPad9:
return exec(launcher, 8);
}
}
return false;
}
private KeyModifiers _unhandledModifiers = KeyModifiers.None;
private WindowState _lastWindowState = WindowState.Normal;