diff options
Diffstat (limited to 'guilib/GUILabel.cpp')
| -rw-r--r-- | guilib/GUILabel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/guilib/GUILabel.cpp b/guilib/GUILabel.cpp index 25470f6346..088fcaebce 100644 --- a/guilib/GUILabel.cpp +++ b/guilib/GUILabel.cpp @@ -23,9 +23,9 @@ #include "utils/CharsetConverter.h" #include <limits> -CGUILabel::CGUILabel(float posX, float posY, float width, float height, const CLabelInfo& labelInfo, CGUILabel::OVER_FLOW overflow, int scrollSpeed) +CGUILabel::CGUILabel(float posX, float posY, float width, float height, const CLabelInfo& labelInfo, CGUILabel::OVER_FLOW overflow) : m_textLayout(labelInfo.font, overflow == OVER_FLOW_WRAP, height) - , m_scrollInfo(50, 0, scrollSpeed) + , m_scrollInfo(50, 0, labelInfo.scrollSpeed, labelInfo.scrollSuffix) , m_maxRect(posX, posY, posX + width, posY + height) { m_selected = false; @@ -39,11 +39,9 @@ CGUILabel::~CGUILabel(void) { } -void CGUILabel::SetScrolling(bool scrolling, int scrollSpeed) +void CGUILabel::SetScrolling(bool scrolling) { m_scrolling = scrolling; - if (scrollSpeed) - m_scrollInfo.SetSpeed(scrollSpeed); if (!m_scrolling) m_scrollInfo.Reset(); } |