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

Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861

Browse Source 
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
This commit is contained in:
Chris Gagnon
2019-06-04 15:42:48 -04:00
parent 51f422866c 20ec410107
commit 930e33cb48
1442 changed files with 166056 additions and 6434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Engine/Source/Editor/LevelEditor/Private/SLevelViewport.cpp
View File

@@ -295,12 +295,12 @@ void SLevelViewport::ConstructViewportOverlayContent()
.AutoHeight()
.Padding(2.0f, 1.0f, 2.0f, 1.0f)
[
SNew(SHorizontalBox)
SNew(SVerticalBox)
.Visibility(this, &SLevelViewport::GetSelectedActorsCurrentLevelTextVisibility)
// Current level label
+ SHorizontalBox::Slot()
.AutoWidth()
.Padding(2.0f, 1.0f, 2.0f, 1.0f)
+ SVerticalBox::Slot()
.AutoHeight()
.Padding(6.0f, 1.0f, 2.0f, 1.0f)
[
SNew(STextBlock)
.Text(this, &SLevelViewport::GetSelectedActorsCurrentLevelText, true)
@@ -308,9 +308,9 @@ void SLevelViewport::ConstructViewportOverlayContent()
.ShadowOffset(FVector2D(1, 1))
]
// Current level
+ SHorizontalBox::Slot()
.AutoWidth()
.Padding(4.0f, 1.0f, 2.0f, 1.0f)
+ SVerticalBox::Slot()
.AutoHeight()
.Padding(6.0f, 1.0f, 2.0f, 1.0f)
[
SNew(STextBlock)
.Text(this, &SLevelViewport::GetSelectedActorsCurrentLevelText, false)
@@ -333,7 +333,7 @@ void SLevelViewport::ConstructViewportOverlayContent()
.VAlign(VAlign_Center)
.ButtonStyle(FEditorStyle::Get(), "EditorViewportToolBar.MenuButton")
.OnClicked(this, &SLevelViewport::OnMenuClicked)
.Visibility(this, &SLevelViewport::GetCurrentLevelTextVisibility)
.Visibility(this, &SLevelViewport::GetCurrentLevelButtonVisibility)
[
SNew(SHorizontalBox)
.Visibility(this, &SLevelViewport::GetCurrentLevelTextVisibility)
@@ -3566,7 +3566,20 @@ EVisibility SLevelViewport::GetCurrentLevelTextVisibility() const
{
ContentVisibility = EVisibility::SelfHitTestInvisible;
}
return (&GetLevelViewportClient() == GCurrentLevelEditingViewportClient) && !IsPlayInEditorViewportActive() ? ContentVisibility : EVisibility::Collapsed;
return (&GetLevelViewportClient() == GCurrentLevelEditingViewportClient)
&& !IsPlayInEditorViewportActive()
&& GetWorld() && GetWorld()->GetCurrentLevel()->OwningWorld->GetLevels().Num() > 1
? ContentVisibility : EVisibility::Collapsed;
}
EVisibility SLevelViewport::GetCurrentLevelButtonVisibility() const
{
EVisibility TextVisibility = GetCurrentLevelTextVisibility();
if (TextVisibility == EVisibility::SelfHitTestInvisible)
{
TextVisibility = EVisibility::Visible;
}
return TextVisibility;
}
EVisibility SLevelViewport::GetSelectedActorsCurrentLevelTextVisibility() const
@@ -3576,7 +3589,11 @@ EVisibility SLevelViewport::GetSelectedActorsCurrentLevelTextVisibility() const
{
ContentVisibility = EVisibility::SelfHitTestInvisible;
}
return (&GetLevelViewportClient() == GCurrentLevelEditingViewportClient) && (GEditor->GetSelectedActorCount() > 0) && !IsPlayInEditorViewportActive() ? ContentVisibility : EVisibility::Collapsed;
return (&GetLevelViewportClient() == GCurrentLevelEditingViewportClient)
&& (GEditor->GetSelectedActorCount() > 0)
&& !IsPlayInEditorViewportActive()
&& GetWorld() && GetWorld()->GetCurrentLevel()->OwningWorld->GetLevels().Num() > 1
? ContentVisibility : EVisibility::Collapsed;
}
FText SLevelViewport::GetSelectedActorsCurrentLevelText(bool bDrawOnlyLabel) const