mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-28 15:45:00 +00:00
Compare commits
5 commits
aff003fd6d
...
57ee1f7dbd
Author | SHA1 | Date | |
---|---|---|---|
![]() |
57ee1f7dbd | ||
![]() |
aaf53ac694 | ||
![]() |
736991198f | ||
![]() |
7dd1389c25 | ||
![]() |
341ac26576 |
3 changed files with 7 additions and 4 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
2025.17
|
2025.18
|
|
@ -35,7 +35,7 @@
|
||||||
<Button Grid.Column="0" Classes="icon_button" VerticalAlignment="Bottom" Margin="6,0,2,3" IsVisible="{OnPlatform True, macOS=False}">
|
<Button Grid.Column="0" Classes="icon_button" VerticalAlignment="Bottom" Margin="6,0,2,3" IsVisible="{OnPlatform True, macOS=False}">
|
||||||
<Button.Flyout>
|
<Button.Flyout>
|
||||||
<MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
|
<MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
|
||||||
<MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+Shift+P">
|
<MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+,">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
|
<Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
|
|
|
@ -264,8 +264,11 @@ namespace SourceGit.Views
|
||||||
}
|
}
|
||||||
else if (e.Key == Key.Escape)
|
else if (e.Key == Key.Escape)
|
||||||
{
|
{
|
||||||
vm.ActivePage.CancelPopup();
|
if (vm.Switcher != null)
|
||||||
vm.CancelSwitcher();
|
vm.CancelSwitcher();
|
||||||
|
else
|
||||||
|
vm.ActivePage.CancelPopup();
|
||||||
|
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue