SlateTextRun

Author: nakosung

Plugins/UnrealJS/Source/JavascriptUMG/JavascriptTextModel.cpp

@@ -0,0 +1,34 @@
+#include "JavascriptUMG.h"
+#include "JavascriptTextModel.h"
+
+void UJavascriptTextModel::SetString(const FString& String)
+{
+	if (!Model.IsValid())
+	{
+		Model = MakeShareable(new FString());
+	}
+
+	*(Model.Get()) = String;
+}
+
+FString UJavascriptTextModel::GetString()
+{
+	if (!Model.IsValid())
+	{
+		return TEXT("");
+	}
+
+	return *(Model.Get());
+}
+
+FJavascriptSlateTextRun UJavascriptTextModel::CreateRun(const FTextBlockStyle& MessageTextStyle, int32 BeginIndex, int32 EndIndex)
+{
+	FJavascriptSlateTextRun Run;
+
+	if (Model.IsValid())
+	{
+		Run.Run = FSlateTextRun::Create(FRunInfo(), Model.ToSharedRef(), MessageTextStyle, FTextRange(BeginIndex, EndIndex));
+	}
+
+	return Run;
+}

Plugins/UnrealJS/Source/JavascriptUMG/JavascriptTextModel.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "JavascriptTextModel.generated.h"
+
+USTRUCT()
+struct FJavascriptSlateTextRun
+{
+	GENERATED_BODY()
+
+	TSharedPtr<IRun> Run;
+};
+
+
+UCLASS()
+class JAVASCRIPTUMG_API UJavascriptTextModel : public UObject
+{
+	GENERATED_BODY()
+
+public:	
+	TSharedPtr<FString> Model;
+
+	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
+	void SetString(const FString& String);
+
+	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
+	FString GetString();
+
+	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
+	FJavascriptSlateTextRun CreateRun(const FTextBlockStyle& MessageTextStyle, int32 BeginIndex, int32 EndIndex);
+};

Plugins/UnrealJS/Source/JavascriptUMG/JavascriptUMGBlueprintLibrary.cpp

@@ -1,5 +1,6 @@
 #include "JavascriptUMG.h"
 #include "JavascriptUMGBlueprintLibrary.h"
+#include "JavascriptTextModel.h"
 
 FSlateColor UJavascriptUMGBlueprintLibrary::SlateColor_UseForeground()
 {
@@ -42,12 +43,19 @@ void UJavascriptUMGBlueprintLibrary::ClearLines(UPARAM(ref) FJavascriptTextLayou
 	TextLayout.TextLayout->ClearLines();
 }
 
-void UJavascriptUMGBlueprintLibrary::AddLine(UPARAM(ref) FJavascriptTextLayout& TextLayout, const FString& String, const FTextBlockStyle& MessageTextStyle)
+void UJavascriptUMGBlueprintLibrary::AddLine(UPARAM(ref) FJavascriptTextLayout& TextLayout, UJavascriptTextModel* Model, const TArray<FJavascriptSlateTextRun>& InRuns)
 {
-	TSharedRef<FString> LineText(new FString(String));
-
 	TArray<TSharedRef<IRun>> Runs;
-	Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle));
-
-	TextLayout.TextLayout->AddLine(LineText, Runs);
-}
+	for (auto InRun : InRuns)
+	{
+		if (InRun.Run.IsValid())
+		{
+			Runs.Add(InRun.Run.ToSharedRef());
+		}		
+	}	
+
+	if (Model && Model->Model.IsValid())
+	{
+		TextLayout.TextLayout->AddLine(Model->Model.ToSharedRef(), Runs);
+	}	
+}

Plugins/UnrealJS/Source/JavascriptUMG/JavascriptUMGBlueprintLibrary.h

@@ -3,6 +3,8 @@
 #include "JavascriptMultiLineEditableTextBox.h"
 #include "JavascriptUMGBlueprintLibrary.generated.h"
 
+class UJavascriptTextModel;
+
 /**
  * 
  */
@@ -28,5 +30,5 @@ class JAVASCRIPTUMG_API UJavascriptUMGBlueprintLibrary : public UBlueprintFuncti
 	static void ClearLines(UPARAM(ref) FJavascriptTextLayout& TextLayout);
 
 	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
-	static void AddLine(UPARAM(ref) FJavascriptTextLayout& TextLayout, const FString& String, const FTextBlockStyle& TextBlockStyle);
+	static void AddLine(UPARAM(ref) FJavascriptTextLayout& TextLayout, UJavascriptTextModel* Model, const TArray<FJavascriptSlateTextRun>& Runs);
 };

Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.cpp

@@ -377,32 +377,44 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 					auto Function = *FuncIt;
 					TFieldIterator<UProperty> It(Function);
 
-					// It should be a static function and have first argument to bind with.
-					if ((Function->FunctionFlags & FUNC_Static) && It && (It->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm)
+					// It should be a static function 
+					if ((Function->FunctionFlags & FUNC_Static) && It)
 					{
-						// The first argument should be type of object
-						if (auto p = Cast<UObjectPropertyBase>(*It))
+						// and have first argument to bind with.
+						if ((It->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm)
 						{
-							auto TargetClass = p->PropertyClass;
+							// The first argument should be type of object
+							if (auto p = Cast<UObjectPropertyBase>(*It))
+							{
+								auto TargetClass = p->PropertyClass;
+
+								// GetWorld() may fail and crash, so target class is bound to UWorld
+								if (TargetClass == UObject::StaticClass() && (p->GetName() == TEXT("WorldContextObject") || p->GetName() == TEXT("WorldContext")))
+								{
+									TargetClass = UWorld::StaticClass();
+								}
 
-							// GetWorld() may fail and crash, so target class is bound to UWorld
-							if (TargetClass == UObject::StaticClass() && (p->GetName() == TEXT("WorldContextObject") || p->GetName() == TEXT("WorldContext")))
+								BlueprintFunctionLibraryMapping.Add(TargetClass, Function);
+								continue;
+							}
+							else if (auto p = Cast<UStructProperty>(*It))
 							{
-								TargetClass = UWorld::StaticClass();
+								BlueprintFunctionLibraryMapping.Add(p->Struct, Function);
+								continue;
 							}
-
-							BlueprintFunctionLibraryMapping.Add(TargetClass, Function);
-						}
-						else if (auto p = Cast<UStructProperty>(*It))
-						{
-							BlueprintFunctionLibraryMapping.Add(p->Struct, Function);
 						}
-					}
-					else if ((Function->FunctionFlags & FUNC_Static) && It && (It->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == (CPF_Parm | CPF_ReturnParm))
-					{
-						if (auto p = Cast<UStructProperty>(*It))
+
+						// Factory function?
+						for (auto It2 = It; It2; ++It2)
 						{
-							BlueprintFunctionLibraryFactoryMapping.Add(p->Struct, Function);
+							if ((It2->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == (CPF_Parm | CPF_ReturnParm))
+							{
+								if (auto p = Cast<UStructProperty>(*It2))
+								{
+									BlueprintFunctionLibraryFactoryMapping.Add(p->Struct, Function);
+									break;
+								}
+							}
 						}
 					}
 				}