[Supertuxkart-commit] SF.net SVN: supertuxkart:[8118] main/trunk/src/guiengine/widgets/ label_widget.cpp

[<au...@us...>]

Revision: 8118
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=8118&view=rev
Author:   auria
Date:     2011-03-30 13:44:53 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
Fixed bug in previous commit, oops

Modified Paths:
--------------
    main/trunk/src/guiengine/widgets/label_widget.cpp

Modified: main/trunk/src/guiengine/widgets/label_widget.cpp
===================================================================
--- main/trunk/src/guiengine/widgets/label_widget.cpp	2011-03-30 13:35:10 UTC (rev 8117)
+++ main/trunk/src/guiengine/widgets/label_widget.cpp	2011-03-30 13:44:53 UTC (rev 8118)
@@ -101,18 +101,21 @@
     m_element->setTabStop(false);
     m_element->setTabGroup(false);
     
-    if (!m_scroll_offset)
-    {
-        m_element->setNotClipped(true);
-    }
-    
     if (m_scroll_speed > 0)
     {
         IGUIFont* font = m_title_font ? GUIEngine::getTitleFont() 
                                       : GUIEngine::getFont();
         core::dimension2du r = font->getDimension(getText().c_str());
-        m_scroll_offset = (float)r.Width;
+        
+        //m_scroll_offset = (float)r.Width;
+        
+        // start scrolled off
+        m_scroll_offset = (float)(-m_element->getAbsolutePosition().getWidth()-10);
     }
+    else
+    {
+        m_element->setNotClipped(true);
+    }
 }   // add
 
 // ----------------------------------------------------------------------------
@@ -176,8 +179,7 @@
 /** Sets horizontal scroll speed. */
 void LabelWidget::setScrollSpeed(float speed)
 {
-    // start scrolled off
-    m_scroll_offset = (float)(-m_element->getAbsolutePosition().getWidth()-10);
+    m_scroll_offset = 0;
     m_scroll_speed  = speed;
 }   // setScrollSpeed
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.