Removed time between consecutive scrolled test displays.

Added count of how often a message is being (fully) displayed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8047 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2011-03-24 21:28:50 +00:00
parent f75f306737
commit ebda46f19a
4 changed files with 13 additions and 4 deletions

View File

@@ -38,8 +38,8 @@
<label proportion="3" height="100%" id="info_addons"
I18N="In the main screen"
text="Loading news from stkaddons..."
align="center" text_align="center" />
text=""
align="center" text_align="left" />
<placeholder id="empty_for_now" proportion="1">
</placeholder>

View File

@@ -312,10 +312,16 @@ const core::stringw NetworkHttp::getNextNewsMessage()
if(m_news.getData().size()==0)
return "";
m_current_news_message++;
core::stringw m("");
m_news.lock();
{
if(m_current_news_message>-1)
{
// Now we have a message that was finished being
// displayed --> increase display count.
m_news.getData()[m_current_news_message].increaseDisplayCount();
}
m_current_news_message++;
if(m_current_news_message >= (int)m_news.getData().size())
m_current_news_message = 0;

View File

@@ -66,7 +66,10 @@ private:
m_message_id = id;
m_display_count = 0;
} // NewsMessage
/** Returns the news message. */
const core::stringw& getNews() const {return m_news;}
/** Increases how often this message was being displayed. */
void increaseDisplayCount() {m_display_count++;}
}; // NewsMessage
mutable Synchronised< std::vector<NewsMessage> > m_news;

View File

@@ -129,7 +129,7 @@ void LabelWidget::setText(const wchar_t *text)
// The c_str is important, otherwise it will call
// LabelWidget::setText(wstring), which will turn
// this function again.
Widget::setText((spaces+text+spaces).c_str());
Widget::setText((spaces+text).c_str());
} // setText