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

Fix to Widget Palette that prevent it from having more that one widget in the palette

Browse Source 
#jira UE-151567
#rb daren.cheng
#preflight 62866bb02c1bb3e25a4abcbf

[CL 20283432 by Vincent Gauthier in ue5-main branch]
This commit is contained in:
Vincent Gauthier
2022-05-19 13:34:08 -04:00
parent 22cf151e57
commit d67e03372e
4 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Editor/UMGEditor/Private/Library/SLibraryViewModel.cpp
+22 -23
View File
@@ -30,7 +30,7 @@
#define LOCTEXT_NAMESPACE "UMG"
void FLibraryViewModel::BuildWidgetTemplateCategory(FString& Category, TArray<TSharedPtr<FWidgetTemplate>>& Templates)
void FLibraryViewModel::BuildWidgetTemplateCategory(FString& Category, TArray<TSharedPtr<FWidgetTemplate>>& Templates, TArray<FString>& FavoritesList)
{
TSharedPtr<FWidgetHeaderViewModel> Header = MakeShareable(new FWidgetHeaderViewModel());
Header->GroupName = FText::FromString(Category);
@@ -40,33 +40,32 @@ void FLibraryViewModel::BuildWidgetTemplateCategory(FString& Category, TArray<TS
Header->Children.Add(TemplateViewModel);
WidgetTemplateListViewModels.Add(TemplateViewModel);
// @TODO: DarenC - Reference for when implementing favorites system
//for ( auto& Template : Entry.Value )
//{
// TSharedPtr<FWidgetTemplateViewModel> TemplateViewModel = MakeShareable(new FWidgetTemplateViewModel());
// TemplateViewModel->Template = Template;
// TemplateViewModel->FavortiesViewModel = this;
// Header->Children.Add(TemplateViewModel);
for ( auto& Template : Templates)
{
TSharedPtr<FWidgetTemplateViewModel> CurrentTemplateViewModel = MakeShareable(new FWidgetTemplateViewModel());
CurrentTemplateViewModel->Template = Template;
CurrentTemplateViewModel->FavortiesViewModel = this;
Header->Children.Add(CurrentTemplateViewModel);
// // If it's a favorite, we also add it to the Favorite section
// int32 index = FavoritesList.Find(Template->Name.ToString());
// if (index != INDEX_NONE)
// {
// TemplateViewModel->SetFavorite();
// If it's a favorite, we also add it to the Favorite section
int32 index = FavoritesList.Find(Template->Name.ToString());
if (index != INDEX_NONE)
{
CurrentTemplateViewModel->SetFavorite();
// // We have to create a second copy of the ViewModel for the treeview has it doesn't support to have the same element twice.
// TSharedPtr<FWidgetTemplateViewModel> FavoriteTemplateViewModel = MakeShareable(new FWidgetTemplateViewModel());
// FavoriteTemplateViewModel->Template = Template;
// FavoriteTemplateViewModel->FavortiesViewModel = this;
// FavoriteTemplateViewModel->SetFavorite();
// We have to create a second copy of the ViewModel for the treeview has it doesn't support to have the same element twice.
TSharedPtr<FWidgetTemplateViewModel> FavoriteTemplateViewModel = MakeShareable(new FWidgetTemplateViewModel());
FavoriteTemplateViewModel->Template = Template;
FavoriteTemplateViewModel->FavortiesViewModel = this;
FavoriteTemplateViewModel->SetFavorite();
// FavoriteHeader->Children.Add(FavoriteTemplateViewModel);
FavoriteHeader->Children.Add(FavoriteTemplateViewModel);
// // Remove the favorite from the temporary list
// FavoritesList.RemoveAt(index);
// }
// Remove the favorite from the temporary list
FavoritesList.RemoveAt(index);
}
//}
}
Header->Children.Sort([](const TSharedPtr<FWidgetViewModel>& L, const TSharedPtr<FWidgetViewModel>& R) { return R->GetName().CompareTo(L->GetName()) > 0; });
Engine/Source/Editor/UMGEditor/Private/Library/SLibraryViewModel.h
+1 -1
View File
@@ -74,7 +74,7 @@ public:
FLibraryViewModel(TSharedPtr<FWidgetBlueprintEditor> InBlueprintEditor) : FWidgetCatalogViewModel(InBlueprintEditor) { }
//~ Begin FWidgetCatalogViewModel Interface
virtual void BuildWidgetTemplateCategory(FString& Category, TArray<TSharedPtr<FWidgetTemplate>>& Templates) override;
virtual void BuildWidgetTemplateCategory(FString& Category, TArray<TSharedPtr<FWidgetTemplate>>& Templates, TArray<FString>& FavoritesList) override;
virtual void AddToFavorites(const FWidgetTemplateViewModel* WidgetTemplateViewModel) override;
virtual void RemoveFromFavorites(const FWidgetTemplateViewModel* WidgetTemplateViewModel) override;
virtual void SetSearchText(const FText& InSearchText) override;