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

Fixed SSplitter hover not painting correctly when using slots with hidden children

Browse Source 
#jira
#rb Lauren.Barnes


#ROBOMERGE-SOURCE: CL 10655363 via CL 10655376
#ROBOMERGE-BOT: (v609-10634694)

[CL 10655391 by jamie dale in Main branch]
This commit is contained in:
jamie dale
2019-12-11 14:49:46 -05:00
parent 476834daf0
commit 1276d4a5f0
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/Slate/Private/Widgets/Layout/SSplitter.cpp
+12 -1
View File
@@ -166,6 +166,17 @@ int32 SSplitter::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeome
// Draw the splitter above any children
MaxLayerId += 1;
// HoveredHandleIndex is an index into our Children array, but some of those may be hidden and missing from ArrangedChildren so we need to update the index for the loop below
int32 ArrangedHoveredHandleIndex = HoveredHandleIndex;
if (ArrangedHoveredHandleIndex != INDEX_NONE && ArrangedChildren.Num() != Children.Num())
{
const TSharedRef<SWidget>& HoveredChildToFind = Children[HoveredHandleIndex].GetWidget();
ArrangedHoveredHandleIndex = ArrangedChildren.IndexOfByPredicate([&HoveredChildToFind](const FArrangedWidget& InArrangedWidget)
{
return InArrangedWidget.Widget == HoveredChildToFind;
});
}
for( int32 ChildIndex = 0; ChildIndex < ArrangedChildren.Num() - 1; ++ChildIndex )
{
const FGeometry& GeometryAfterSplitter = ArrangedChildren[ FMath::Clamp(ChildIndex + 1, 0, ArrangedChildren.Num()-1) ].Geometry;
@@ -186,7 +197,7 @@ int32 SSplitter::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeome
HandlePosition.Set( 0, -PhysicalSplitterHandleSize/*-(HalfHitDetectionSplitterHandleSize + HalfPhysicalSplitterHandleSize) */);
}
if (HoveredHandleIndex != ChildIndex)
if (ArrangedHoveredHandleIndex != ChildIndex)
{
FSlateDrawElement::MakeBox(
OutDrawElements,