File tree 1 file changed +9
-2
lines changed
1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change 352
352
Margin =" 8,0,0,0"
353
353
Padding =" 8,0"
354
354
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>
357
362
<SplitButton .Flyout>
358
363
<MenuFlyout >
359
364
<MenuItem Header =" {DynamicResource Text.WorkingCopy.CommitToEdit}" Command =" {Binding Commit}" />
370
375
Command =" {Binding Commit}"
371
376
HotKey =" {OnPlatform Ctrl+Enter, macOS=⌘+Enter}"
372
377
IsVisible =" {Binding InProgressContext, Converter={x:Static ObjectConverters.IsNull}}"
378
+ IsEnabled =" {Binding !IsCommitting}"
373
379
ToolTip.Placement=" Top"
374
380
ToolTip.VerticalOffset=" 0" >
375
381
<ToolTip .Tip>
401
407
Padding =" 8,0"
402
408
Command =" {Binding CommitWithPush}"
403
409
HotKey =" Alt+Enter"
410
+ IsEnabled =" {Binding !IsCommitting}"
404
411
ToolTip.Tip=" {OnPlatform Alt+Enter, macOS=⌥+Enter}"
405
412
ToolTip.Placement=" Top"
406
413
ToolTip.VerticalOffset=" 0" >
You can’t perform that action at this time.
0 commit comments