dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-24 05:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ux: re-design merge option style

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-17 15:08:49 +08:00
parent 10fd0f9d15
commit ddfc868df3
No known key found for this signature in database
3 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ViewModels/Merge.cs
View file

@ -15,7 +15,7 @@ namespace SourceGit.ViewModels
get;
}
public Models.MergeMode SelectedMode
public Models.MergeMode Mode
{
get;
set;
@ -28,7 +28,7 @@ namespace SourceGit.ViewModels
Source = source;
Into = into;
SelectedMode = AutoSelectMergeMode();
Mode = AutoSelectMergeMode();
View = new Views.Merge() { DataContext = this };
}
@ -39,7 +39,7 @@ namespace SourceGit.ViewModels
Source = source;
Into = into;
SelectedMode = AutoSelectMergeMode();
Mode = AutoSelectMergeMode();
View = new Views.Merge() { DataContext = this };
}
@ -50,7 +50,7 @@ namespace SourceGit.ViewModels
Source = source;
Into = into;
SelectedMode = AutoSelectMergeMode();
Mode = AutoSelectMergeMode();
View = new Views.Merge() { DataContext = this };
}
@ -61,7 +61,7 @@ namespace SourceGit.ViewModels
return Task.Run(() =>
{
new Commands.Merge(_repo.FullPath, _sourceName, SelectedMode.Arg, SetProgressDescription).Exec();
new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, SetProgressDescription).Exec();
CallUIThread(() => _repo.SetWatcherEnabled(true));
return true;
});