birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
-4
View File
@@ -2595,8 +2595,6 @@ float UiDynamicScrollBoxComponent::CalculateContentBeginningDeltaAfterSizeChange
AZ::Vector2 curContentSize(0.0f, 0.0f);
EBUS_EVENT_ID_RESULT(curContentSize, contentEntityId, UiTransformBus, GetCanvasSpaceSizeNoScaleRotate);
float curSize = m_isVertical ? curContentSize.GetY() : curContentSize.GetX();
UiTransform2dInterface::Offsets offsets;
EBUS_EVENT_ID_RESULT(offsets, contentEntityId, UiTransform2dBus, GetOffsets);
@@ -2632,8 +2630,6 @@ float UiDynamicScrollBoxComponent::CalculateContentEndDeltaAfterSizeChange(float
AZ::Vector2 curContentSize(0.0f, 0.0f);
EBUS_EVENT_ID_RESULT(curContentSize, contentEntityId, UiTransformBus, GetCanvasSpaceSizeNoScaleRotate);
float curSize = m_isVertical ? curContentSize.GetY() : curContentSize.GetX();
UiTransform2dInterface::Offsets offsets;
EBUS_EVENT_ID_RESULT(offsets, contentEntityId, UiTransform2dBus, GetOffsets);