Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-06 07:15:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Aloshi 2013-06-16 16:24:17 -05:00
parent da6ae9ac10 1b71abd44c
commit 19eb1c412f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/TextListComponent.h
View file

@ -10,7 +10,7 @@
#include <memory> #include <memory>
#include "../Sound.h" #include "../Sound.h"
#define MARQUEE_DELAY 600 #define MARQUEE_DELAY 900
#define MARQUEE_SPEED 16 #define MARQUEE_SPEED 16
#define MARQUEE_RATE 3 #define MARQUEE_RATE 3
@ -315,6 +315,8 @@ void TextListComponent<T>::clear()
{ {
mRowVector.clear(); mRowVector.clear();
mSelection = 0; mSelection = 0;
mMarqueeOffset = 0;
mMarqueeTime = -MARQUEE_DELAY;
} }
template <typename T> template <typename T>