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

Add the ability for modes to add a secondary toolbar below the Level Editor toolbar, currently used by the modeling mode

Browse Source 
#jira UE-175474
#preflight 63d951357a39a18021eb4ad1
#rb lauren.barnes, semion.piskarev

[CL 23938896 by aditya ravichandran in ue5-main branch]
This commit is contained in:
aditya ravichandran
2023-01-31 17:06:24 -05:00
parent 9c5059d280
commit 2a47203660
17 changed files with 351 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Engine/Source/Editor/LevelEditor/Private/SLevelEditor.cpp
View File

@@ -181,6 +181,7 @@ void SLevelEditor::RegisterMenus()
{
FLevelEditorMenu::RegisterLevelEditorMenus();
FLevelEditorToolBar::RegisterLevelEditorToolBar(LevelEditorCommands.ToSharedRef(), SharedThis(this));
FLevelEditorToolBar::RegisterLevelEditorSecondaryModeToolbar();
}
void SLevelEditor::Construct( const SLevelEditor::FArguments& InArgs)
@@ -304,6 +305,13 @@ void SLevelEditor::Initialize( const TSharedRef<SDockTab>& OwnerTab, const TShar
TSharedRef<SWidget> ContentArea = RestoreContentArea( OwnerTab, OwnerWindow );
FLevelEditorMenu::MakeLevelEditorMenu(LevelEditorCommands, SharedThis(this));
SecondaryModeToolbarWidget =
SNew(SBorder)
.Padding(0)
.BorderImage(FAppStyle::Get().GetBrush( "NoBorder" ));
SecondaryModeToolbarWidget->SetContent(FLevelEditorToolBar::MakeLevelEditorSecondaryModeToolbar(LevelEditorCommands.ToSharedRef(), ModeUILayers));
ChildSlot
[
@@ -315,6 +323,12 @@ void SLevelEditor::Initialize( const TSharedRef<SDockTab>& OwnerTab, const TShar
FLevelEditorToolBar::MakeLevelEditorToolBar(LevelEditorCommands.ToSharedRef(), SharedThis(this))
]
+SVerticalBox::Slot()
.Padding(FMargin(0.0f,0.0f,0.0f,2.0f))
.AutoHeight()
[
SecondaryModeToolbarWidget.ToSharedRef()
]
+SVerticalBox::Slot()
.Padding(4.0f, 2.f, 4.f, 2.f)
.FillHeight( 1.0f )
[
@@ -579,10 +593,13 @@ void SLevelEditor::OnToolkitHostingStarted( const TSharedRef< class IToolkit >&
// Otherwise, it's going to be a huge cluster trying to distinguish tabs for different assets of the same type
// of editor
TSharedPtr<FLevelEditorModeUILayer> ModeUILayer = MakeShareable(new FLevelEditorModeUILayer(this));
ModeUILayer->SetSecondaryModeToolbarName(FLevelEditorToolBar::GetSecondaryModeToolbarName());
HostedToolkits.Add( Toolkit );
ModeUILayer->OnToolkitHostingStarted(Toolkit);
ModeUILayers.Add(Toolkit->GetToolkitFName(), ModeUILayer);
SecondaryModeToolbarWidget->SetContent(FLevelEditorToolBar::MakeLevelEditorSecondaryModeToolbar(LevelEditorCommands.ToSharedRef(), ModeUILayers));
}
void SLevelEditor::OnToolkitHostingFinished( const TSharedRef< class IToolkit >& Toolkit )
@@ -595,6 +612,8 @@ void SLevelEditor::OnToolkitHostingFinished( const TSharedRef< class IToolkit >&
}
HostedToolkits.Remove( Toolkit );
SecondaryModeToolbarWidget->SetContent(FLevelEditorToolBar::MakeLevelEditorSecondaryModeToolbar(LevelEditorCommands.ToSharedRef(), ModeUILayers));
// @todo toolkit minor: If user clicks X on all opened world-centric toolkit tabs, should we exit that toolkit automatically?
// Feel 50/50 about this. It's totally valid to use the "Save" menu even after closing tabs, etc. Plus, you can spawn the tabs back up using the tab area down-down menu.
}