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

Replacing legacy EditorStyle calls with AppStyle

Browse Source 
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
This commit is contained in:
Lauren Barnes
2022-05-09 13:12:28 -04:00
parent 91688f5a36
commit 6248f8d412
2175 changed files with 8125 additions and 8177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Developer/IOS/IOSPlatformEditor/IOSPlatformEditor.Build.cs
View File

@@ -18,7 +18,7 @@ public class IOSPlatformEditor : ModuleRules
"MainFrame",
"Slate",
"SlateCore",
"EditorStyle",
"PropertyEditor",
"SharedSettingsWidgets",
"SourceControl",

22
Engine/Source/Developer/IOS/IOSPlatformEditor/Private/IOSTargetSettingsCustomization.cpp
View File

@@ -10,7 +10,7 @@
#include "Widgets/Input/SEditableTextBox.h"
#include "Widgets/Input/SButton.h"
#include "Widgets/Layout/SWidgetSwitcher.h"
#include "EditorStyleSet.h"
#include "Styling/AppStyle.h"
#include "IOSRuntimeSettings.h"
#include "PropertyHandle.h"
#include "DetailLayoutBuilder.h"
@@ -501,8 +501,8 @@ void FIOSTargetSettingsCustomization::BuildPListSection(IDetailLayoutBuilder& De
[
SNew(SRichTextBlock)
.Text(LOCTEXT("ProvisionMessage", "<RichTextBlock.TextHighlight>Note</>: If no provision is selected the one in green will be used to provision the IPA."))
.TextStyle(FEditorStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FEditorStyle::Get())
.TextStyle(FAppStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FAppStyle::Get())
.AutoWrapText(true)
]
@@ -660,8 +660,8 @@ void FIOSTargetSettingsCustomization::BuildPListSection(IDetailLayoutBuilder& De
[
SNew(SRichTextBlock)
.Text(LOCTEXT("CertificateMessage", "<RichTextBlock.TextHighlight>Note</>: If no certificate is selected then the one in green will be used to sign the IPA."))
.TextStyle(FEditorStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FEditorStyle::Get())
.TextStyle(FAppStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FAppStyle::Get())
.AutoWrapText(true)
]
+ SHorizontalBox::Slot()
@@ -729,8 +729,8 @@ void FIOSTargetSettingsCustomization::BuildPListSection(IDetailLayoutBuilder& De
[
SNew(SRichTextBlock)
.Text(LOCTEXT("IOSUpgradeInfoMessage", "<RichTextBlock.TextHighlight>Note to users from 4.6 or earlier</>: We now <RichTextBlock.TextHighlight>GENERATE</> an Info.plist when building, so if you have customized your .plist file, you will need to put all of your changes into the below settings. Note that we don't touch the .plist file that is in your project directory, so you can use it as reference."))
.TextStyle(FEditorStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FEditorStyle::Get())
.TextStyle(FAppStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FAppStyle::Get())
.AutoWrapText(true)
// + SRichTextBlock::HyperlinkDecorator(TEXT("browser"), FSlateHyperlinkRun::FOnClick::CreateStatic(&OnBrowserLinkClicked))
]
@@ -1538,11 +1538,11 @@ const FSlateBrush* FIOSTargetSettingsCustomization::GetProvisionStatus() const
{
if( bProvisionInstalled )
{
return FEditorStyle::GetBrush("Automation.Success");
return FAppStyle::GetBrush("Automation.Success");
}
else
{
return FEditorStyle::GetBrush("Automation.Fail");
return FAppStyle::GetBrush("Automation.Fail");
}
}
@@ -1550,11 +1550,11 @@ const FSlateBrush* FIOSTargetSettingsCustomization::GetCertificateStatus() const
{
if( bCertificateInstalled )
{
return FEditorStyle::GetBrush("Automation.Success");
return FAppStyle::GetBrush("Automation.Success");
}
else
{
return FEditorStyle::GetBrush("Automation.Fail");
return FAppStyle::GetBrush("Automation.Fail");
}
}