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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-05 20:05:25 -07:00
parent 4358b6eb27 6b2452379f
commit e28d04aea6
389 changed files with 5267 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiTextComponent.cpp
+1 -1
View File
@@ -4417,7 +4417,7 @@ void UiTextComponent::HandleWidthOnlyShrinkToFitWithWrapping(
{
// Consider the sizes of all overflowing lines when calculating the
// scale to reduce the number of times we need to iterate.
int numOverflowingLines = drawBatchLinesOut.batchLines.size() - maxLinesElementCanHold;
int numOverflowingLines = static_cast<int>(drawBatchLinesOut.batchLines.size() - maxLinesElementCanHold);
DrawBatchLineContainer::reverse_iterator riter;
int overflowLineCount = 0;
float overflowingLineSize = 0.0f;