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

Update layout manager to no more crash when the screen is full (which happened with Arabic, for some reason there is much empty space above and below arabic characters)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11124 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-04-18 20:49:34 +00:00
parent d0fb8aa78a
commit b71a93feb9
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/guiengine/layout_manager.cpp
View File

@ -438,6 +438,12 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
left_space -= (horizontal ? widgets[n].m_w : widgets[n].m_h); left_space -= (horizontal ? widgets[n].m_w : widgets[n].m_h);
} // next widget } // next widget
if (left_space < 0)
{
fprintf(stderr, "[LayoutManager] WARNING: statically sized widgets took all the place!!\n");
left_space = 0;
}
// ---- lay widgets in row // ---- lay widgets in row
int x = parent->m_x; int x = parent->m_x;
int y = parent->m_y; int y = parent->m_y;
@ -509,6 +515,14 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
if (widgets[n].m_w > max_width) widgets[n].m_w = max_width; if (widgets[n].m_w > max_width) widgets[n].m_w = max_width;
} }
if (widgets[n].m_w <= 0)
{
fprintf(stderr, "WARNING: widget '%s' has a width of %i (left_space = %i, "
"fraction = %f, max_width = %s)\n", widgets[n].m_properties[PROP_ID].c_str(),
widgets[n].m_w, left_space, fraction, widgets[n].m_properties[PROP_MAX_WIDTH].c_str());
widgets[n].m_w = 1;
}
x += widgets[n].m_w; x += widgets[n].m_w;
} }
else else
@ -521,6 +535,14 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
if (widgets[n].m_h > max_height) widgets[n].m_h = max_height; if (widgets[n].m_h > max_height) widgets[n].m_h = max_height;
} }
if (widgets[n].m_h <= 0)
{
fprintf(stderr, "WARNING: widget '%s' has a height of %i (left_space = %i, "
"fraction = %f, max_width = %s)\n", widgets[n].m_properties[PROP_ID].c_str(),
widgets[n].m_h, left_space, fraction, widgets[n].m_properties[PROP_MAX_WIDTH].c_str());
widgets[n].m_h = 1;
}
std::string align = widgets[n].m_properties[ PROP_ALIGN ]; std::string align = widgets[n].m_properties[ PROP_ALIGN ];
if (align.size() < 1) if (align.size() < 1)
{ {