diff --git a/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.cpp b/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.cpp index 48563ec4e605..e3ba0d8bc002 100644 --- a/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.cpp +++ b/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.cpp @@ -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 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 I void SEditToolMenuDialog::CloseContainingWindow() { TSharedPtr 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(); } diff --git a/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.h b/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.h index 09a52f2c1eb7..e2d12c37d0f3 100644 --- a/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.h +++ b/Engine/Source/Editor/ToolMenusEditor/Private/SEditToolMenuDialog.h @@ -60,6 +60,7 @@ private: FReply HandleResetAllClicked(); FReply UndoAllChanges(); + void LoadSelectedObjectState(); void SaveSettingsToDisk(); TSharedRef BuildMenuPropertiesWidget(); @@ -70,8 +71,6 @@ private: void SetSelectedItem(const FName InName, ESelectedEditMenuEntryType InType); - bool bClosedWithOk; - TWeakObjectPtr MenuDialogOpenedWith; TWeakObjectPtr CurrentGeneratedMenu;