From: Olivier Teulière <ipkiss@videolan.org>
Date: Mon, 12 Feb 2007 20:17:49 +0000 (+0000)
Subject:  * skins2/controls/ctrl_text.cpp: Fixed weird behaviours occurring when resizing... 
X-Git-Tag: 0.9.0-test0~8597
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6413b11959c64a745b356beb7af95b66dbaa5924;p=vlc

 * skins2/controls/ctrl_text.cpp: Fixed weird behaviours occurring when resizing a Text control with moving text
---

diff --git a/modules/gui/skins2/controls/ctrl_text.cpp b/modules/gui/skins2/controls/ctrl_text.cpp
index df0e86508a..09e79c3326 100644
--- a/modules/gui/skins2/controls/ctrl_text.cpp
+++ b/modules/gui/skins2/controls/ctrl_text.cpp
@@ -288,6 +288,11 @@ void CtrlText::onPositionChange()
         if( m_pImg->getWidth() < getPosition()->getWidth() )
         {
             m_pCurrImg = m_pImg;
+
+            // When the control becomes wide enough for the text to display,
+            // make sure to stop any scrolling effect
+            m_pTimer->stop();
+            m_xPos = 0;
         }
         else
         {