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

Fix OrionEditor build (for real this time)

Browse Source 
#jira UE-78268
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: dave.belanger
#ROBOMERGE-SOURCE: CL 7706289 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v389-7813075)

[CL 7861745 by dave belanger in Dev-Core branch]
This commit is contained in:
dave belanger
2019-08-08 04:14:52 -04:00
parent 06ebab73f1 1d07356dca
commit 3574879195
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableText.h
View File

@@ -111,7 +111,11 @@ public:
UFUNCTION(BlueprintSetter)
void SetWidgetStyle(const FTextBlockStyle& InWidgetStyle);
//~ Begin UTextLayoutWidget Interface
virtual void SetJustification(ETextJustify::Type InJustification) override;
//~ End UTextLayoutWidget Interface
//~ Begin UWidget Interface
virtual void SynchronizeProperties() override;
//~ End UWidget Interface
@@ -133,8 +137,6 @@ protected:
virtual TSharedRef<SWidget> RebuildWidget() override;
// End of UWidget
virtual void SetJustification(ETextJustify::Type InJustification) override;
void HandleOnTextChanged(const FText& Text);
void HandleOnTextCommitted(const FText& Text, ETextCommit::Type CommitMethod);

6
Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableTextBox.h
View File

@@ -127,9 +127,11 @@ public:
//TODO UMG Add Set BackgroundColor
//TODO UMG Add Set ForegroundColor
//TODO UMG Add Set Font
//TODO UMG Add Set Justification
public:
//~ Begin UTextLayoutWidget Interface
virtual void SetJustification(ETextJustify::Type InJustification) override;
//~ End UTextLayoutWidget Interface
//~ Begin UWidget Interface
virtual void SynchronizeProperties() override;
@@ -152,8 +154,6 @@ protected:
virtual TSharedRef<SWidget> RebuildWidget() override;
// End of UWidget
virtual void SetJustification(ETextJustify::Type InJustification) override;
void HandleOnTextChanged(const FText& Text);
void HandleOnTextCommitted(const FText& Text, ETextCommit::Type CommitMethod);

8
Engine/Source/Runtime/UMG/Public/Components/RichTextBlock.h
View File

@@ -101,7 +101,11 @@ public:
public:
URichTextBlock(const FObjectInitializer& ObjectInitializer);
//~ Begin UTextLayoutWidget Interface
virtual void SetJustification(ETextJustify::Type InJustification) override;
//~ End UTextLayoutWidget Interface
// UWidget interface
virtual void SynchronizeProperties() override;
// End of UWidget interface
@@ -144,8 +148,6 @@ public:
protected:
virtual TSharedRef<SWidget> RebuildWidget() override;
virtual void SetJustification(ETextJustify::Type InJustification) override;
virtual void UpdateStyleData();
void RebuildStyleInstance();

6
Engine/Source/Runtime/UMG/Public/Components/TextBlock.h
View File

@@ -161,6 +161,10 @@ public:
UFUNCTION(BlueprintCallable, Category="Widget", meta=(DisplayName="SetText (Text)"))
virtual void SetText(FText InText);
//~ Begin UTextLayoutWidget Interface
virtual void SetJustification(ETextJustify::Type InJustification) override;
//~ End UTextLayoutWidget Interface
//~ Begin UWidget Interface
virtual void SynchronizeProperties() override;
//~ End UWidget Interface
@@ -199,8 +203,6 @@ protected:
virtual void OnBindingChanged(const FName& Property) override;
//~ End UWidget Interface
virtual void SetJustification(ETextJustify::Type InJustification) override;
/** Get the text that should be displayed in the internal Slate widget (allows flags to mutate the display text without modifying the persistent designer property data) */
virtual TAttribute<FText> GetDisplayText();