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

Fixed coordinate -1 resulting in weird bugs

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8705 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-05-25 01:28:14 +00:00
parent a74485f890
commit 71832931b0
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/guiengine/layout_manager.cpp
View File

@ -115,23 +115,41 @@ void LayoutManager::readCoords(Widget* self)
// ---- try converting to number // ---- try converting to number
// x coord // x coord
{ {
int abs_x = -1, percent_x = -1; int abs_x = 0x7FFFFFFF, percent_x = 0x7FFFFFFF;
if (convertToCoord(x, &abs_x, &percent_x )) if (convertToCoord(x, &abs_x, &percent_x ))
{ {
if (abs_x >= 0) self->m_absolute_x = abs_x; if (abs_x >= 0 && abs_x != 0x7FFFFFFF)
else if (abs_x < -1) self->m_absolute_reverse_x = abs(abs_x); {
else if (percent_x > -1) self->m_relative_x = (float)percent_x; self->m_absolute_x = abs_x;
}
else if (abs_x < 0)
{
self->m_absolute_reverse_x = abs(abs_x);
}
else if (percent_x >= 0 && percent_x != 0x7FFFFFFF)
{
self->m_relative_x = (float)percent_x;
}
} }
} }
// y coord // y coord
{ {
int abs_y = -1, percent_y = -1; int abs_y = 0x7FFFFFFF, percent_y = 0x7FFFFFFF;
if (convertToCoord(y, &abs_y, &percent_y )) if (convertToCoord(y, &abs_y, &percent_y ))
{ {
if (abs_y >= 0) self->m_absolute_y = abs_y; if (abs_y >= 0 && abs_y != 0x7FFFFFFF)
else if (abs_y < -1) self->m_absolute_reverse_y = abs(abs_y); {
else if (percent_y > -1) self->m_relative_y = (float)percent_y; self->m_absolute_y = abs_y;
}
else if (abs_y < 0)
{
self->m_absolute_reverse_y = abs(abs_y);
}
else if (percent_y >= 0 && percent_y != 0x7FFFFFFF)
{
self->m_relative_y = (float)percent_y;
}
} }
} }