File tree Expand file tree Collapse file tree 2 files changed +10
-13
lines changed
Expand file tree Collapse file tree 2 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -29,11 +29,7 @@ public bool IncludeUntracked
2929 public bool CanCommitWithPush
3030 {
3131 get => _canCommitWithPush ;
32- set
33- {
34- if ( SetProperty ( ref _canCommitWithPush , value ) )
35- OnPropertyChanged ( nameof ( IsCommitWithPushVisible ) ) ;
36- }
32+ set => SetProperty ( ref _canCommitWithPush , value ) ;
3733 }
3834
3935 public bool HasUnsolvedConflicts
@@ -89,16 +85,10 @@ public bool UseAmend
8985
9086 Staged = GetStagedChanges ( ) ;
9187 SelectedStaged = [ ] ;
92- OnPropertyChanged ( nameof ( IsCommitWithPushVisible ) ) ;
9388 }
9489 }
9590 }
9691
97- public bool IsCommitWithPushVisible
98- {
99- get => ! UseAmend && CanCommitWithPush ;
100- }
101-
10292 public List < Models . Change > Unstaged
10393 {
10494 get => _unstaged ;
Original file line number Diff line number Diff line change 355355 HotKey =" Alt+Enter"
356356 ToolTip.Tip=" {OnPlatform Alt+Enter, macOS=⌥+Enter}"
357357 ToolTip.Placement=" Top"
358- ToolTip.VerticalOffset=" 0"
359- IsVisible =" {Binding IsCommitWithPushVisible}" />
358+ ToolTip.VerticalOffset=" 0" >
359+ <Button .IsVisible>
360+ <MultiBinding Converter =" {x:Static BoolConverters.And}" >
361+ <Binding Path =" UseAmend" Converter =" {x:Static BoolConverters.Not}" />
362+ <Binding Path =" CanCommitWithPush" />
363+ <Binding Path =" InProgressContext" Converter =" {x:Static ObjectConverters.IsNull}" />
364+ </MultiBinding >
365+ </Button .IsVisible>
366+ </Button >
360367 </Grid >
361368 </Grid >
362369 </Grid >
You can’t perform that action at this time.
0 commit comments