mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-20 19:55:00 +00:00
fix: double-clicking button trigger binded command twice (#1032)
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
61d7f36be4
commit
fc3043b93c
1 changed files with 9 additions and 2 deletions
|
@ -352,8 +352,13 @@
|
|||
Margin="8,0,0,0"
|
||||
Padding="8,0"
|
||||
Command="{Binding ContinueMerge}"
|
||||
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
|
||||
IsEnabled="{Binding !HasUnsolvedConflicts}">
|
||||
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
|
||||
<SplitButton.IsEnabled>
|
||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||
<Binding Path="IsCommitting" Converter="{x:Static BoolConverters.Not}"/>
|
||||
<Binding Path="HasUnsolvedConflicts" Converter="{x:Static BoolConverters.Not}"/>
|
||||
</MultiBinding>
|
||||
</SplitButton.IsEnabled>
|
||||
<SplitButton.Flyout>
|
||||
<MenuFlyout>
|
||||
<MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}" Command="{Binding Commit}"/>
|
||||
|
@ -370,6 +375,7 @@
|
|||
Command="{Binding Commit}"
|
||||
HotKey="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"
|
||||
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNull}}"
|
||||
IsEnabled="{Binding !IsCommitting}"
|
||||
ToolTip.Placement="Top"
|
||||
ToolTip.VerticalOffset="0">
|
||||
<ToolTip.Tip>
|
||||
|
@ -401,6 +407,7 @@
|
|||
Padding="8,0"
|
||||
Command="{Binding CommitWithPush}"
|
||||
HotKey="Alt+Enter"
|
||||
IsEnabled="{Binding !IsCommitting}"
|
||||
ToolTip.Tip="{OnPlatform Alt+Enter, macOS=⌥+Enter}"
|
||||
ToolTip.Placement="Top"
|
||||
ToolTip.VerticalOffset="0">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue