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 deprecation issue when running editor utility widget, by moving the deprecation code from the post load to the serialize method.

Browse Source 
During the loading process, when the object is compiled, it is duplicated before the call to post load, so the deprecation code was not called before duplication, and as the deprecated properties of the object were not duplicated => the old font was lost.

#jira UE-165518
#preflight
#rb patrick.boutot
#lockdown jean-michel.dignard

[CL 22388828 by yohann dossantos in ue5-main branch]
This commit is contained in:
yohann dossantos
2022-10-06 20:10:02 -04:00
parent 936f0c7e6d
commit b087dfd7f9
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Engine/Source/Runtime/UMG/Private/Components/EditableTextBox.cpp
View File

@@ -25,7 +25,9 @@ static FEditableTextBoxStyle* EditorEditableTextBoxStyle = nullptr;
UEditableTextBox::UEditableTextBox(const FObjectInitializer& ObjectInitializer)
: Super(ObjectInitializer)
{
#if WITH_EDITOR
bIsFontDeprecationDone = false;
#endif
PRAGMA_DISABLE_DEPRECATION_WARNINGS
IsReadOnly = false;
IsPassword = false;
@@ -74,27 +76,23 @@ UEditableTextBox::UEditableTextBox(const FObjectInitializer& ObjectInitializer)
#endif
}
#if WITH_EDITORONLY_DATA
void UEditableTextBox::PostLoad()
{
Super::PostLoad();
PRAGMA_DISABLE_DEPRECATION_WARNINGS
if (GetLinkerCustomVersion(FUE5ReleaseStreamObjectVersion::GUID) < FUE5ReleaseStreamObjectVersion::RemoveDuplicatedStyleInfo)
{
FTextBlockStyle& TextStyle = WidgetStyle.TextStyle;
TextStyle.SetFont(WidgetStyle.Font_DEPRECATED);
}
PRAGMA_ENABLE_DEPRECATION_WARNINGS
}
void UEditableTextBox::Serialize(FArchive& Ar)
{
Ar.UsingCustomVersion(FUE5ReleaseStreamObjectVersion::GUID);
Super::Serialize(Ar);
}
#if WITH_EDITOR
PRAGMA_DISABLE_DEPRECATION_WARNINGS
if (Ar.IsLoading() && !bIsFontDeprecationDone && GetLinkerCustomVersion(FUE5ReleaseStreamObjectVersion::GUID) < FUE5ReleaseStreamObjectVersion::RemoveDuplicatedStyleInfo)
{
FTextBlockStyle& TextStyle = WidgetStyle.TextStyle;
TextStyle.SetFont(WidgetStyle.Font_DEPRECATED);
bIsFontDeprecationDone = true;
}
PRAGMA_ENABLE_DEPRECATION_WARNINGS
#endif
}
void UEditableTextBox::ReleaseSlateResources(bool bReleaseChildren)
{

20
Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableTextBox.cpp
View File

@@ -62,6 +62,8 @@ UMultiLineEditableTextBox::UMultiLineEditableTextBox(const FObjectInitializer& O
// The CDO isn't an editor widget and thus won't use the editor style, call post edit change to mark difference from CDO
PostEditChange();
}
bIsFontDeprecationDone = false;
#endif // WITH_EDITOR
bIsReadOnly = false;
@@ -70,24 +72,20 @@ UMultiLineEditableTextBox::UMultiLineEditableTextBox(const FObjectInitializer& O
AutoWrapText = true;
}
#if WITH_EDITOR
void UMultiLineEditableTextBox::PostLoad()
void UMultiLineEditableTextBox::Serialize(FArchive& Ar)
{
Super::PostLoad();
Ar.UsingCustomVersion(FUE5ReleaseStreamObjectVersion::GUID);
if (GetLinkerCustomVersion(FUE5ReleaseStreamObjectVersion::GUID) < FUE5ReleaseStreamObjectVersion::RemoveDuplicatedStyleInfo)
Super::Serialize(Ar);
#if WITH_EDITOR
if (Ar.IsLoading() && !bIsFontDeprecationDone && GetLinkerCustomVersion(FUE5ReleaseStreamObjectVersion::GUID) < FUE5ReleaseStreamObjectVersion::RemoveDuplicatedStyleInfo)
{
TextStyle_DEPRECATED.SetFont(WidgetStyle.Font_DEPRECATED);
WidgetStyle.SetTextStyle(TextStyle_DEPRECATED);
bIsFontDeprecationDone = true;
}
}
#endif
void UMultiLineEditableTextBox::Serialize(FArchive& Ar)
{
Super::Serialize(Ar);
Ar.UsingCustomVersion(FUE5ReleaseStreamObjectVersion::GUID);
}
void UMultiLineEditableTextBox::ReleaseSlateResources(bool bReleaseChildren)

10
Engine/Source/Runtime/UMG/Public/Components/EditableTextBox.h
View File

@@ -263,11 +263,7 @@ public:
#if WITH_EDITOR
virtual const FText GetPaletteCategory() override;
#endif
#if WITH_EDITORONLY_DATA
virtual void Serialize(FArchive& Ar) override;
virtual void PostLoad() override;
#endif
protected:
//~ Begin UWidget Interface
@@ -286,4 +282,10 @@ protected:
PROPERTY_BINDING_IMPLEMENTATION(FText, Text);
PROPERTY_BINDING_IMPLEMENTATION(FText, HintText);
private:
#if WITH_EDITORONLY_DATA
UPROPERTY()
bool bIsFontDeprecationDone;
#endif
};

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

@@ -146,9 +146,7 @@ public:
#if WITH_EDITOR
virtual const FText GetPaletteCategory() override;
virtual void PostLoad() override;
#endif
virtual void Serialize(FArchive& Ar) override;
protected:
@@ -163,4 +161,10 @@ protected:
TSharedPtr<SMultiLineEditableTextBox> MyEditableTextBlock;
PROPERTY_BINDING_IMPLEMENTATION(FText, HintText);
private:
#if WITH_EDITORONLY_DATA
UPROPERTY()
bool bIsFontDeprecationDone;
#endif
};