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

Fixed a bug in the widget manager which disallowed columns after widgets.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja
2008-04-26 08:51:46 +00:00
parent 12f861c3a2
commit a180b85849
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/widget_manager.cpp
View File

@@ -121,29 +121,20 @@ bool WidgetManager::insertColumn()
const int LAST_ELEM = (int)m_elems.size() - 1;
const int LAST_WGT = (int)m_widgets.size() - 1;
if( LAST_ELEM > -1)
if( LAST_ELEM > -1 && m_elems[LAST_ELEM].type == ET_COLUMN )
{
if( m_elems[LAST_ELEM].type == ET_WGT )
if( LAST_WGT > -1 )
{
std::cerr << "WARNING: tried to add a column after widget " <<
"with token " << m_widgets[LAST_WGT].token << ".\n";
return false;
std::cerr << "WARNING: tried to add a column twice after " <<
"widget with token " << m_widgets[LAST_WGT].token <<
".\n";
}
else if ( m_elems[LAST_ELEM].type == ET_WGT )
else
{
if( LAST_WGT > -1 )
{
std::cerr << "WARNING: tried to add a column twice after " <<
"widget with token " << m_widgets[LAST_WGT].token <<
".\n";
}
else
{
std::cerr << "WARNING: tried to add a column twice before" <<
" the first widget.\n";
}
return false;
std::cerr << "WARNING: tried to add a column twice before" <<
" the first widget.\n";
}
return false;
}
m_elems.push_back( WidgetElement( ET_COLUMN, 0));