funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

stop horizontal scollable text after the end of text and not after the whole texts disappears off the screen

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2020-02-16 12:13:47 +01:00
parent 8e777aba46
commit 72fda25983
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp
View File

@ -492,7 +492,7 @@ void ReloadableScrollingText::draw( )
float scale = 1.0f; float scale = 1.0f;
// determine image width from 1st line // determine image width that can fit the container from 1st line
for ( unsigned int i = 0; i < text_[0].size( ); ++i ) for ( unsigned int i = 0; i < text_[0].size( ); ++i )
{ {
Font::GlyphInfo glyph; Font::GlyphInfo glyph;
@ -539,8 +539,9 @@ void ReloadableScrollingText::draw( )
baseViewInfo.ImageHeight = oldImageHeight; baseViewInfo.ImageHeight = oldImageHeight;
SDL_Rect rect;
SDL_Rect rect;
float position = 0.0f; float position = 0.0f;
if (direction_ == "horizontal") if (direction_ == "horizontal")
@ -619,6 +620,7 @@ void ReloadableScrollingText::draw( )
} }
// Determine image width // Determine image width
imageWidth = 0;
for (unsigned int l = 0; l < text_.size( ); ++l) for (unsigned int l = 0; l < text_.size( ); ++l)
{ {
for (unsigned int i = 0; i < text_[l].size( ); ++i) for (unsigned int i = 0; i < text_[l].size( ); ++i)
@ -626,13 +628,23 @@ void ReloadableScrollingText::draw( )
Font::GlyphInfo glyph; Font::GlyphInfo glyph;
if (font->getRect( text_[l][i], glyph )) if (font->getRect( text_[l][i], glyph ))
{ {
if ( glyph.minX < 0 )
{
imageWidth += glyph.minX;
}
imageWidth += glyph.advance; imageWidth += glyph.advance;
} }
} }
} }
// Reset scrolling position when we're done // Reset scrolling position when we're done
if (currentPosition_ > imageWidth * scale * scaleX_) /*printf("currentPosition_ = %f, imageWidth * scale * scaleX_= %f, xOrigin + imageMaxWidth = %f\n",
currentPosition_ ,
imageWidth * scale * scaleX_,
(static_cast<int>( xOrigin ) + imageMaxWidth));*/
//if (currentPosition_ > imageWidth * scale * scaleX_)
if (waitStartTime_ <= 0 &&
imageWidth * scale * scaleX_ - currentPosition_ <= imageMaxWidth)
{ {
waitStartTime_ = startTime_; waitStartTime_ = startTime_;
waitEndTime_ = endTime_; waitEndTime_ = endTime_;