From a68bdcec3096ef410488e181bbcb970e4a64ae6f Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 19 Jan 2021 00:26:02 +0100 Subject: [PATCH] Fixed two MSVC compiler warnings. --- es-core/src/components/ScrollableContainer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/es-core/src/components/ScrollableContainer.cpp b/es-core/src/components/ScrollableContainer.cpp index 68121e33f..af7f1b57f 100644 --- a/es-core/src/components/ScrollableContainer.cpp +++ b/es-core/src/components/ScrollableContainer.cpp @@ -100,11 +100,12 @@ void ScrollableContainer::update(int deltaTime) // Adjust the scrolling speed based on the width of the container. float widthModifier = contentSize.x() / static_cast(Renderer::getScreenWidth()); - adjustedAutoScrollSpeed *= widthModifier; + adjustedAutoScrollSpeed = static_cast(adjustedAutoScrollSpeed * widthModifier); // Also adjust the scrolling speed based on the size of the font. float fontSizeModifier = mSmallFontSize / mFontSize; - adjustedAutoScrollSpeed *= fontSizeModifier * fontSizeModifier; + adjustedAutoScrollSpeed = static_cast(adjustedAutoScrollSpeed * + fontSizeModifier * fontSizeModifier); if (adjustedAutoScrollSpeed < 0) adjustedAutoScrollSpeed = 1;