File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed
Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change 352352 Margin =" 8,0,0,0"
353353 Padding =" 8,0"
354354 Command =" {Binding ContinueMerge}"
355- IsVisible =" {Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
356- IsEnabled =" {Binding !HasUnsolvedConflicts}" >
355+ IsVisible =" {Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}" >
356+ <SplitButton .IsEnabled>
357+ <MultiBinding Converter =" {x:Static BoolConverters.And}" >
358+ <Binding Path =" IsCommitting" Converter =" {x:Static BoolConverters.Not}" />
359+ <Binding Path =" HasUnsolvedConflicts" Converter =" {x:Static BoolConverters.Not}" />
360+ </MultiBinding >
361+ </SplitButton .IsEnabled>
357362 <SplitButton .Flyout>
358363 <MenuFlyout >
359364 <MenuItem Header =" {DynamicResource Text.WorkingCopy.CommitToEdit}" Command =" {Binding Commit}" />
370375 Command =" {Binding Commit}"
371376 HotKey =" {OnPlatform Ctrl+Enter, macOS=⌘+Enter}"
372377 IsVisible =" {Binding InProgressContext, Converter={x:Static ObjectConverters.IsNull}}"
378+ IsEnabled =" {Binding !IsCommitting}"
373379 ToolTip.Placement=" Top"
374380 ToolTip.VerticalOffset=" 0" >
375381 <ToolTip .Tip>
401407 Padding =" 8,0"
402408 Command =" {Binding CommitWithPush}"
403409 HotKey =" Alt+Enter"
410+ IsEnabled =" {Binding !IsCommitting}"
404411 ToolTip.Tip=" {OnPlatform Alt+Enter, macOS=⌥+Enter}"
405412 ToolTip.Placement=" Top"
406413 ToolTip.VerticalOffset=" 0" >
You can’t perform that action at this time.
0 commit comments