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/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008

Browse Source 
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
This commit is contained in:
Marc Audy
2018-09-25 10:11:35 -04:00
parent 0151b9d207
commit af90b7bcd4
2171 changed files with 131372 additions and 43232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/UMG/Private/Components/ListView.cpp
+7 -11
View File
@@ -109,10 +109,9 @@ bool UListView::BP_IsItemVisible(UObject* Item) const
void UListView::BP_NavigateToItem(UObject* Item)
{
const ULocalPlayer* LocalPlayer = GetOwningLocalPlayer();
if (Item && LocalPlayer)
if (Item)
{
RequestNavigateToItem(Item, LocalPlayer->GetControllerId());
RequestNavigateToItem(Item);
}
}
@@ -123,12 +122,9 @@ void UListView::NavigateToIndex(int32 Index)
void UListView::BP_ScrollItemIntoView(UObject* Item)
{
if (Item && MyListView.IsValid())
if (Item)
{
if (const ULocalPlayer* LocalPlayer = GetOwningLocalPlayer())
{
RequestScrollItemIntoView(Item, LocalPlayer->GetControllerId());
}
RequestScrollItemIntoView(Item);
}
}
@@ -156,7 +152,7 @@ bool UListView::IsRefreshPending() const
void UListView::BP_SetSelectedItem(UObject* Item)
{
if (MyListView.IsValid() && ListItems.Contains(Item))
if (MyListView.IsValid())
{
MyListView->SetSelection(Item, ESelectInfo::Direct);
}
@@ -215,9 +211,9 @@ FMargin UListView::GetDesiredEntryPadding(UObject* Item) const
return FMargin(0.f);
}
UUserWidget& UListView::OnGenerateEntryWidgetInternal(UObject* Item, const TSharedRef<STableViewBase>& OwnerTable)
UUserWidget& UListView::OnGenerateEntryWidgetInternal(UObject* Item, TSubclassOf<UUserWidget> DesiredEntryClass, const TSharedRef<STableViewBase>& OwnerTable)
{
return GenerateTypedEntry(OwnerTable);
return GenerateTypedEntry(DesiredEntryClass, OwnerTable);
}
void UListView::OnItemClickedInternal(UObject* ListItem)