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

Added FIXMEs to annotate a minor set of bugs in the layout code that Joerg just stumbled upon

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-08-18 23:59:05 +00:00
parent eb52c1d4af
commit ca63182f5c
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/guiengine/layout_manager.cpp
View File

@@ -289,9 +289,14 @@ void LayoutManager::calculateLayout(ptr_vector<Widget>& widgets, AbstractTopLeve
if (align.size() < 1)
{
if (widgets[n].m_properties[ PROP_Y ].size() > 0)
{
// FIXME: percentages won't work here
widgets[n].m_y = atoi(widgets[n].m_properties[ PROP_Y ].c_str());
}
else
{
widgets[n].m_y = y;
}
}
else if (align == "top") widgets[n].m_y = y;
else if (align == "center") widgets[n].m_y = y + h/2 - widgets[n].m_h/2;
@@ -323,9 +328,14 @@ void LayoutManager::calculateLayout(ptr_vector<Widget>& widgets, AbstractTopLeve
if (align.size() < 1)
{
if (widgets[n].m_properties[ PROP_X ].size() > 0)
{
// FIXME: percentages won't work here
widgets[n].m_x = atoi(widgets[n].m_properties[ PROP_X ].c_str());
}
else
{
widgets[n].m_x = x;
}
}
else if (align == "left") widgets[n].m_x = x;
else if (align == "center") widgets[n].m_x = x + w/2 - widgets[n].m_w/2;
@@ -351,9 +361,14 @@ void LayoutManager::calculateLayout(ptr_vector<Widget>& widgets, AbstractTopLeve
if (align.size() < 1)
{
if (widgets[n].m_properties[ PROP_Y ].size() > 0)
{
// FIXME: percentages won't work here
widgets[n].m_y = atoi(widgets[n].m_properties[ PROP_Y ].c_str());
}
else
{
widgets[n].m_y = y;
}
}
else if (align == "top") widgets[n].m_y = y;
else if (align == "center") widgets[n].m_y = y + h/2 - widgets[n].m_h/2;
@@ -371,9 +386,14 @@ void LayoutManager::calculateLayout(ptr_vector<Widget>& widgets, AbstractTopLeve
if (align.size() < 1)
{
if (widgets[n].m_properties[ PROP_X ].size() > 0)
{
// FIXME: percentages won't work here
widgets[n].m_x = atoi(widgets[n].m_properties[ PROP_X ].c_str());
}
else
{
widgets[n].m_x = x;
}
}
else if (align == "left") widgets[n].m_x = x;
else if (align == "center") widgets[n].m_x = x + w/2 - widgets[n].m_w/2;