izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use a callback when the workspace has finished syncing to callback into UGSTab to update WorkspaceSettings

Browse Source 
#jira none
#rb none
#fyi Robert.Seiver
#preflight none

[CL 21057478 by Brandon Schaefer in ue5-main branch]
This commit is contained in:
Brandon Schaefer
2022-07-12 11:58:47 -04:00
parent 164e6417b5
commit 6841de8c53
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Engine/Source/Programs/SlateUGS/Private/UGSCore/Workspace.cpp
View File

@@ -342,10 +342,10 @@ uint32 FWorkspace::Run()
PendingChangeNumber = CurrentChangeNumber;
FPlatformAtomics::InterlockedCompareExchangePointer((void**)&ActiveWorkspace, nullptr, this);
// if(OnUpdateComplete != null)
// {
// OnUpdateComplete(Context, Result, StatusMessage);
// }
if (OnUpdateComplete)
{
OnUpdateComplete(WorkerThreadContext.ToSharedRef(), Result, StatusMessage);
}
WorkerThreadContext.Reset();
return 0;

2
Engine/Source/Programs/SlateUGS/Private/UGSCore/Workspace.h
View File

@@ -80,7 +80,7 @@ public:
const FString SelectedClientFileName;
const FString TelemetryProjectPath;
TFunction<void(TSharedRef<FWorkspaceUpdateContext, ESPMode::ThreadSafe>, EWorkspaceUpdateResult, FString)> OnUpdateComplete;
TFunction<void(TSharedRef<FWorkspaceUpdateContext, ESPMode::ThreadSafe>, EWorkspaceUpdateResult, const FString&)> OnUpdateComplete;
FWorkspace(TSharedRef<FPerforceConnection> InPerforce, const FString& InLocalRootPath, const FString& InSelectedLocalFileName, const FString& InClientRootPath, const FString& InSelectedClientFileName, int InInitialChangeNumber, int InLastBuiltChangeNumber, const FString& InTelemetryProjectPath, TSharedRef<FLineBasedTextWriter> InLog);
~FWorkspace();

20
Engine/Source/Programs/SlateUGS/Private/UGSTab.cpp
View File

@@ -200,11 +200,13 @@ bool UGSTab::OnWorkspaceChosen(const FString& Project)
if (bIsDataValid)
{
ProjectFileName = Project;
SetupWorkspace();
GameSyncTabView->SetStreamPathText(FText::FromString(DetectSettings->StreamName));
GameSyncTabView->SetProjectPathText(FText::FromString(ProjectFileName));
TabWidget->SetContent(GameSyncTabView); // Todo: Set GameSyncTabView data
TabWidget->SetLabel(FText::FromString(DetectSettings->StreamName));
return true;
}
@@ -244,6 +246,20 @@ bool UGSTab::IsSyncing() const
return false;
}
void UGSTab::OnWorkspaceSyncComplete(TSharedRef<FWorkspaceUpdateContext, ESPMode::ThreadSafe> WorkspaceContext, EWorkspaceUpdateResult SyncResult, const FString& StatusMessage)
{
WorkspaceSettings->CurrentChangeNumber = Workspace->GetCurrentChangeNumber();
WorkspaceSettings->LastBuiltChangeNumber = Workspace->GetLastBuiltChangeNumber();
WorkspaceSettings->LastSyncResult = SyncResult;
WorkspaceSettings->LastSyncResultMessage = StatusMessage;
WorkspaceSettings->LastSyncTime = WorkspaceContext->StartTime;
// TODO check this is valid, may be off
WorkspaceSettings->LastSyncDurationSeconds = (FDateTime::UtcNow() - WorkspaceContext->StartTime).GetSeconds();
UserSettings->Save();
}
void UGSTab::SetupWorkspace()
{
ProjectFileName = FUtility::GetPathWithCorrectCase(ProjectFileName);
@@ -301,6 +317,10 @@ void UGSTab::SetupWorkspace()
TelemetryProjectIdentifier,
MakeShared<FLogWidgetTextWriter>(GameSyncTabView->GetSyncLog().ToSharedRef()));
Workspace->OnUpdateComplete = [this] (TSharedRef<FWorkspaceUpdateContext, ESPMode::ThreadSafe> WorkspaceContext, EWorkspaceUpdateResult SyncResult, const FString& StatusMessage) {
OnWorkspaceSyncComplete(WorkspaceContext, SyncResult, StatusMessage);
};
// Todo: Eventually move into the sync operation
CombinedSyncFilter = FUserSettings::GetCombinedSyncFilter(
Workspace->GetSyncCategories(),

5
Engine/Source/Programs/SlateUGS/Private/UGSTab.h
View File

@@ -26,6 +26,11 @@ public:
bool IsSyncing() const;
private:
void OnWorkspaceSyncComplete(
TSharedRef<FWorkspaceUpdateContext, ESPMode::ThreadSafe> WorkspaceContext,
EWorkspaceUpdateResult SyncResult,
const FString& StatusMessage);
// Core functions
void SetupWorkspace();