ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a warning and fixed a bug with text scrolling introduced in the previous commit.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja 2008-02-03 05:59:40 +00:00
parent d20a7a229b
commit 7d2e056752
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widget.cpp
View File

@ -313,7 +313,7 @@ void Widget::update(const float DELTA)
std::cerr << "(Did you set the text?)\n";
}
int x_pos = (int)m_scroll_pos_x - m_width * 0.5f;
int x_pos = (int)(m_scroll_pos_x - m_width * 0.5f);
int y_pos = - (int)m_scroll_pos_y + (lines - 1 )* m_text_size / 2;
size_t line_start = 0;
@ -324,18 +324,18 @@ void Widget::update(const float DELTA)
do
{
draw = true;
if(y_pos + m_text_size / 2 > m_height )
if(y_pos + m_text_size / 2 > m_height / 2 )
{
if(y_pos - m_text_size / 2 > m_height) draw = false;
if(y_pos - m_text_size / 2 > m_height / 2) draw = false;
else
{
out_of_rect = true;
glScissor(m_x, m_y, m_width, m_height);
}
}
else if(y_pos - m_text_size / 2 < 0)
else if(y_pos + (m_height - m_text_size) / 2 < 0)
{
if(y_pos + m_text_size / 2 < 0) draw = false;
if(y_pos + (m_height + m_text_size) / 2 < 0) draw = false;
else
{
out_of_rect = true;