michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2025-01-11 23:57:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: get owner page of repsitory dynamically

Browse source
This commit is contained in:
leo 2025-01-09 09:21:58 +08:00
parent f07e838e6f
commit 9baa2c9fad
No known key found for this signature in database
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ViewModels/Launcher.cs
View file

@ -316,8 +316,6 @@ namespace SourceGit.ViewModels
page.Data = repo; page.Data = repo;
} }
repo.SetOwnerPage(page);
if (page != _activePage) if (page != _activePage)
ActivePage = page; ActivePage = page;
else else

34
src/ViewModels/Repository.cs
View file

@ -493,7 +493,6 @@ namespace SourceGit.ViewModels
public void Close() public void Close()
{ {
_page = null;
SelectedView = null; // Do NOT modify. Used to remove exists widgets for GC.Collect SelectedView = null; // Do NOT modify. Used to remove exists widgets for GC.Collect
var settingsSerialized = JsonSerializer.Serialize(_settings, JsonCodeGen.Default.RepositorySettings); var settingsSerialized = JsonSerializer.Serialize(_settings, JsonCodeGen.Default.RepositorySettings);
@ -538,24 +537,25 @@ namespace SourceGit.ViewModels
SearchCommitFilterSuggestion.Clear(); SearchCommitFilterSuggestion.Clear();
} }
public void SetOwnerPage(LauncherPage page)
{
_page = page;
}
public bool CanCreatePopup() public bool CanCreatePopup()
{ {
return !_isAutoFetching && _page != null && _page.CanCreatePopup(); var page = GetOwnerPage();
if (page == null)
return false;
return !_isAutoFetching && page.CanCreatePopup();
} }
public void ShowPopup(Popup popup) public void ShowPopup(Popup popup)
{ {
_page.Popup = popup; var page = GetOwnerPage();
if (page != null)
page.Popup = popup;
} }
public void ShowAndStartPopup(Popup popup) public void ShowAndStartPopup(Popup popup)
{ {
_page.StartPopup(popup); GetOwnerPage()?.StartPopup(popup);
} }
public void RefreshAll() public void RefreshAll()
@ -2111,6 +2111,21 @@ namespace SourceGit.ViewModels
return compare; return compare;
} }
private LauncherPage GetOwnerPage()
{
var launcher = App.GetLauncer();
if (launcher == null)
return null;
foreach (var page in launcher.Pages)
{
if (page.Node.Id.Equals(_fullpath))
return page;
}
return null;
}
private BranchTreeNode.Builder BuildBranchTree(List<Models.Branch> branches, List<Models.Remote> remotes) private BranchTreeNode.Builder BuildBranchTree(List<Models.Branch> branches, List<Models.Remote> remotes)
{ {
var builder = new BranchTreeNode.Builder(); var builder = new BranchTreeNode.Builder();
@ -2335,7 +2350,6 @@ namespace SourceGit.ViewModels
Dispatcher.UIThread.Invoke(() => IsAutoFetching = false); Dispatcher.UIThread.Invoke(() => IsAutoFetching = false);
} }
private LauncherPage _page = null;
private string _fullpath = string.Empty; private string _fullpath = string.Empty;
private string _gitDir = string.Empty; private string _gitDir = string.Empty;
private Models.RepositorySettings _settings = null; private Models.RepositorySettings _settings = null;