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

Fixed code relying on SLATE_TEXT_ATTRIBUTE for STextBlock.

Browse Source 
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

This fixes any editor/engine specific code that was passing text to Slate as FString rather than FText.

[CL 2399803 by Jamie Dale in Main branch]
This commit is contained in:
Jamie Dale
2015-01-07 09:52:40 -05:00
parent ed90d7c0fa
commit a569f6b356
406 changed files with 1833 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Editor/DetailCustomizations/Private/CollisionProfileNameCustomization.cpp
+7 -7
View File
@@ -70,7 +70,7 @@ TSharedRef<SWidget> FCollisionProfileNameCustomization::OnGenerateWidget(TShared
{
return
SNew(STextBlock)
.Text(InItem->ToString())
.Text(FText::FromName(*InItem))
.Font(IDetailLayoutBuilder::GetDetailFont());
}
@@ -148,19 +148,19 @@ void FCollisionProfileNameCustomization::GetPropertyAsName(FName& OutName) const
}
FString FCollisionProfileNameCustomization::GetProfileComboBoxContent() const
FText FCollisionProfileNameCustomization::GetProfileComboBoxContent() const
{
TSharedPtr<FName> SelectedName = GetSelectedName();
if (SelectedName.IsValid())
{
return (*SelectedName->ToString());
return FText::FromName(*SelectedName);
}
return TEXT("Invalid");
return LOCTEXT("Invalid", "Invalid");
}
FString FCollisionProfileNameCustomization::GetProfileComboBoxToolTip() const
FText FCollisionProfileNameCustomization::GetProfileComboBoxToolTip() const
{
UCollisionProfile* CollisionProfile = UCollisionProfile::Get();
check(CollisionProfile);
@@ -171,10 +171,10 @@ FString FCollisionProfileNameCustomization::GetProfileComboBoxToolTip() const
FCollisionResponseTemplate ProfileTemplate;
if (CollisionProfile->GetProfileTemplate(ProfileName, ProfileTemplate))
{
return ProfileTemplate.HelpMessage;
return FText::FromString(ProfileTemplate.HelpMessage);
}
return TEXT("Invalid");
return LOCTEXT("Invalid", "Invalid");
}