Merge branch 'master' of github.com:ncsoft/Unreal.js-core

crocuis · crocuis · commit d7830eb91c85 · 2017-06-06T06:49:59.000+09:00
diff --git a/Source/JavascriptUMG/JavascriptWindow.cpp b/Source/JavascriptUMG/JavascriptWindow.cpp
@@ -45,7 +45,7 @@ TSharedRef<SWidget> UJavascriptWindow::RebuildWidget()
 		.SizingRule((ESizingRule)SizingRule)
 		.IsPopupWindow(IsPopupWindow)
 		.FocusWhenFirstShown(FocusWhenFirstShown)
-		.ActivateWhenFirstShown(ActivateWhenFirstShown)
+		.ActivationPolicy(EWindowActivationPolicy::FirstShown)
 		.UseOSWindowBorder(UseOSWindowBorder)
 		.HasCloseButton(HasCloseButton)
 		.SupportsMaximize(SupportsMaximize)
@@ -138,4 +138,4 @@ void UJavascriptWindow::SetOpacity(const float InOpacity)
 	{
 		MyWindow->SetOpacity(InOpacity);
 	}
-}
+}
diff --git a/Source/V8/Private/V8Module.cpp b/Source/V8/Private/V8Module.cpp
@@ -35,7 +35,7 @@ static float GV8IdleTaskBudget = 1 / 60.0f;
 UJavascriptSettings::UJavascriptSettings(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_simd");
+	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-gc");
 }
 
 void UJavascriptSettings::Apply() const

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ TSharedRef<SWidget> UJavascriptWindow::RebuildWidget()`
`45`	`45`	`.SizingRule((ESizingRule)SizingRule)`
`46`	`46`	`.IsPopupWindow(IsPopupWindow)`
`47`	`47`	`.FocusWhenFirstShown(FocusWhenFirstShown)`
`48`		`- .ActivateWhenFirstShown(ActivateWhenFirstShown)`
	`48`	`+ .ActivationPolicy(EWindowActivationPolicy::FirstShown)`
`49`	`49`	`.UseOSWindowBorder(UseOSWindowBorder)`
`50`	`50`	`.HasCloseButton(HasCloseButton)`
`51`	`51`	`.SupportsMaximize(SupportsMaximize)`
`@@ -138,4 +138,4 @@ void UJavascriptWindow::SetOpacity(const float InOpacity)`
`138`	`138`	`{`
`139`	`139`	`MyWindow->SetOpacity(InOpacity);`
`140`	`140`	`}`
`141`		`-}`
	`141`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static float GV8IdleTaskBudget = 1 / 60.0f;`
`35`	`35`	`UJavascriptSettings::UJavascriptSettings(const FObjectInitializer& ObjectInitializer)`
`36`	`36`	`: Super(ObjectInitializer)`
`37`	`37`	`{`
`38`		`- V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_simd");`
	`38`	`+ V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-gc");`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`void UJavascriptSettings::Apply() const`