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

Menu editor reset now updates details panel

Browse Source 
#rb none
#rnx

[CL 9057697 by Rex Hill in Dev-Editor branch]
This commit is contained in:
Rex Hill
2019-09-24 17:54:12 -04:00
parent ced417c5a9
commit 9723958dae
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.cpp
View File

@@ -369,8 +369,6 @@ void SEditToolMenuDialog::InitMenu(UToolMenu* InMenu)
void SEditToolMenuDialog::Construct( const FArguments& InArgs )
{
bClosedWithOk = false;
InitMenu(InArgs._SourceMenu);
SetSelectedItem(NAME_None, ESelectedEditMenuEntryType::Menu);
@@ -843,7 +841,11 @@ void SEditToolMenuDialog::OnToggleVisibleClicked(TSharedRef<const FMultiBlock> I
MenuCustomization->AddEntry(ItemName)->Visibility = bHidden ? ECustomizedToolMenuVisibility::Visible : ECustomizedToolMenuVisibility::Hidden;
}
// Update details panel
LoadSelectedObjectState();
}
void SEditToolMenuDialog::LoadSelectedObjectState()
{
if (SelectedObject.IsValid())
{
SelectedObject->LoadState();
@@ -858,8 +860,7 @@ void SEditToolMenuDialog::OnToggleVisibleClicked(TSharedRef<const FMultiBlock> I
void SEditToolMenuDialog::CloseContainingWindow()
{
TSharedPtr<SWindow> ContainingWindow = FSlateApplication::Get().FindWidgetWindow(AsShared());
if ( ContainingWindow.IsValid() )
if (ContainingWindow.IsValid())
{
ContainingWindow->RequestDestroyWindow();
}
@@ -874,7 +875,9 @@ FReply SEditToolMenuDialog::Refresh()
}
BuildWidget();
LoadSelectedObjectState();
return FReply::Handled();
}

3
Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.h
View File

@@ -60,6 +60,7 @@ private:
FReply HandleResetAllClicked();
FReply UndoAllChanges();
void LoadSelectedObjectState();
void SaveSettingsToDisk();
TSharedRef<SWidget> BuildMenuPropertiesWidget();
@@ -70,8 +71,6 @@ private:
void SetSelectedItem(const FName InName, ESelectedEditMenuEntryType InType);
bool bClosedWithOk;
TWeakObjectPtr<UToolMenu> MenuDialogOpenedWith;
TWeakObjectPtr<UToolMenu> CurrentGeneratedMenu;