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

enhance: clear unhandled key modifer before running command (#748)

Browse Source
This commit is contained in:
leo
2024-11-27 20:21:01 +08:00
parent 1872148d98
commit e224f59ea7
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Views/Launcher.axaml.cs
View File

@@ -72,6 +72,11 @@ namespace SourceGit.Views
return _unhandledModifiers.HasFlag(modifier);
}
public void ClearKeyModifier()
{
_unhandledModifiers = KeyModifiers.None;
}
protected override void OnOpened(EventArgs e)
{
base.OnOpened(e);

15
src/Views/RepositoryToolbar.axaml.cs
View File

@@ -53,6 +53,7 @@ namespace SourceGit.Views
if (!startDirectly && OperatingSystem.IsMacOS())
startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
launcher.ClearKeyModifier();
repo.Fetch(startDirectly);
e.Handled = true;
}
@@ -67,6 +68,7 @@ namespace SourceGit.Views
if (!startDirectly && OperatingSystem.IsMacOS())
startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
launcher.ClearKeyModifier();
repo.Pull(startDirectly);
e.Handled = true;
}
@@ -81,6 +83,7 @@ namespace SourceGit.Views
if (!startDirectly && OperatingSystem.IsMacOS())
startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
launcher.ClearKeyModifier();
repo.Push(startDirectly);
e.Handled = true;
}
@@ -89,8 +92,16 @@ namespace SourceGit.Views
private void StashAll(object _, RoutedEventArgs e)
{
var launcher = this.FindAncestorOfType<Launcher>();
(DataContext as ViewModels.Repository)?.StashAll(launcher?.HasKeyModifier(KeyModifiers.Control) ?? false);
e.Handled = true;
if (launcher is not null && DataContext is ViewModels.Repository repo)
{
var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
if (!startDirectly && OperatingSystem.IsMacOS())
startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
launcher.ClearKeyModifier();
repo.StashAll(startDirectly);
e.Handled = true;
}
}
private void OpenGitFlowMenu(object sender, RoutedEventArgs e)