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

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

Browse Source 
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
This commit is contained in:
Ryan Vance
2019-03-13 15:19:08 -04:00
parent 05a60bb14f
commit 35eb0041ab
3052 changed files with 37080 additions and 383412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Engine/Source/Programs/LiveCodingConsole/Private/LiveCodingConsole.cpp
View File

@@ -150,6 +150,10 @@ private:
void BringToFront()
{
HWND WindowHandle = (HWND)Window->GetNativeWindow()->GetOSWindowHandle();
if (IsIconic(WindowHandle))
{
ShowWindow(WindowHandle, SW_RESTORE);
}
::SetWindowPos(WindowHandle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
::SetWindowPos(WindowHandle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
}
@@ -192,7 +196,7 @@ private:
}
FString ManifestFileName = FPaths::ConvertRelativePathToFull(FPaths::EngineIntermediateDir() / TEXT("LiveCoding.json"));
Arguments += FString::Printf(TEXT("-LiveCoding -LiveCodingManifest=\"%s\""), *ManifestFileName);
Arguments += FString::Printf(TEXT("-LiveCoding -LiveCodingManifest=\"%s\" -WaitMutex"), *ManifestFileName);
AppendLogLine(ELiveCodingLogVerbosity::Info, *FString::Printf(TEXT("Running %s %s"), *Executable, *Arguments));
@@ -285,6 +289,12 @@ private:
}
}
void ShowConsole()
{
SetVisible(true);
BringToFront();
}
void OnCompileStartedAsync()
{
FScopeLock Lock(&CriticalSection);
@@ -297,11 +307,13 @@ private:
{
if (!CompileNotification.IsValid())
{
ShowConsole();
FNotificationInfo Info(FText::FromString(TEXT("Starting...")));
Info.bFireAndForget = false;
Info.FadeOutDuration = 0.0f;
Info.ExpireDuration = 0.0f;
Info.Hyperlink = FSimpleDelegate::CreateRaw(this, &FLiveCodingConsoleApp::BringToFront);
Info.Hyperlink = FSimpleDelegate::CreateRaw(this, &FLiveCodingConsoleApp::ShowConsole);
Info.HyperlinkText = LOCTEXT("BuildStatusShowConsole", "Show Console");
Info.ButtonDetails.Add(FNotificationButtonInfo(LOCTEXT("BuildStatusCancel", "Cancel"), FText(), FSimpleDelegate::CreateRaw(this, &FLiveCodingConsoleApp::CancelBuild), SNotificationItem::CS_Pending));