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

Finished column insertion(minus bugs that will obviously appear) and changed the main menu to using a column instead of line breaks; the widget manager delete_wgts() function was renamed to reset(), as it now does all kinds of cleanups, and layout no longer restores default stares or resets columns or deletes breaks, these changes were made so that layout() can be called repeatedly. Plus I changed a bunch of warning messages of 'unexistant widgets' to 'unnamed' widgets, since widgets without a token assigned also trigger this warning and added a Warning: tag in front of these messages, since they are non-fatal. I apologize for the amount of changes introduced in one commit.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja 2007-12-01 16:26:00 +00:00
parent 8d27cefdd5
commit a335606ec9
20 changed files with 253 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/char_sel.cpp
View File

@ -116,7 +116,7 @@ CharSel::CharSel(int whichPlayer)
//-----------------------------------------------------------------------------
CharSel::~CharSel()
{
widget_manager->delete_wgts();
widget_manager->reset();
ssgDeRefDelete(m_kart);
delete m_context;

2
src/gui/config_controls.cpp
View File

@ -104,7 +104,7 @@ ConfigControls::ConfigControls()
//-----------------------------------------------------------------------------
ConfigControls::~ConfigControls()
{
widget_manager->delete_wgts();
widget_manager->reset();
// widgetSet -> delete_widget(m_menu_id) ;
}

2
src/gui/config_display.cpp
View File

@ -74,7 +74,7 @@ ConfigDisplay::ConfigDisplay()
ConfigDisplay::~ConfigDisplay()
{
// widgetSet -> delete_widget(m_menu_id) ;
widget_manager->delete_wgts();
widget_manager->reset();
}
//-----------------------------------------------------------------------------

2
src/gui/config_sound.cpp
View File

@ -85,7 +85,7 @@ ConfigSound::ConfigSound()
//-----------------------------------------------------------------------------
ConfigSound::~ConfigSound()
{
widget_manager->delete_wgts();
widget_manager->reset();
}
//-----------------------------------------------------------------------------

2
src/gui/credits_menu.cpp
View File

@ -87,7 +87,7 @@ CreditsMenu::CreditsMenu()
//-----------------------------------------------------------------------------
CreditsMenu::~CreditsMenu()
{
widget_manager->delete_wgts() ;
widget_manager->reset() ;
} // ~CreditsMenu
//-----------------------------------------------------------------------------

2
src/gui/difficulty.cpp
View File

@ -69,7 +69,7 @@ Difficulty::Difficulty()
//-----------------------------------------------------------------------------
Difficulty::~Difficulty()
{
widget_manager->delete_wgts();
widget_manager->reset();
} // ~Difficulty
//-----------------------------------------------------------------------------

2
src/gui/game_mode.cpp
View File

@ -99,7 +99,7 @@ GameMode::GameMode()
//-----------------------------------------------------------------------------
GameMode::~GameMode()
{
widget_manager->delete_wgts();
widget_manager->reset();
}
//-----------------------------------------------------------------------------

2
src/gui/grand_prix_ending.cpp
View File

@ -166,7 +166,7 @@ GrandPrixEnd::GrandPrixEnd()
//-----------------------------------------------------------------------------
GrandPrixEnd::~GrandPrixEnd()
{
widget_manager->delete_wgts();
widget_manager->reset();
ssgDeRefDelete(m_kart);
delete m_context;

2
src/gui/grand_prix_select.cpp
View File

@ -111,7 +111,7 @@ GrandPrixSelect::GrandPrixSelect()
//-----------------------------------------------------------------------------
GrandPrixSelect::~GrandPrixSelect()
{
widget_manager->delete_wgts();
widget_manager->reset();
// widgetSet -> delete_widget(m_menu_id) ;
// glDeleteLists(m_rect, 1);
} // GrandPrixSelect

6
src/gui/help_menu.cpp
View File

@ -92,7 +92,7 @@ HelpMenu::HelpMenu()
//-----------------------------------------------------------------------------
HelpMenu::~HelpMenu()
{
widget_manager->delete_wgts() ;
widget_manager->reset() ;
if (m_box != NULL && m_silver_coin != NULL && m_gold_coin != NULL
&& m_banana != NULL )
@ -436,12 +436,12 @@ void HelpMenu::select()
switch ( widget_manager->get_selected_wgt() )
{
case WTOK_FIRST_PAGE:
widget_manager->delete_wgts();
widget_manager->reset();
switch_to_first_screen();
break;
case WTOK_SECOND_PAGE:
widget_manager->delete_wgts();
widget_manager->reset();
switch_to_second_screen();
break;

9
src/gui/main_menu.cpp
View File

@ -43,33 +43,28 @@ MainMenu::MainMenu()
widget_manager->set_initial_rect_state(SHOW_RECT, WGT_AREA_ALL, WGT_TRANS_BLACK);
widget_manager->set_initial_text_state(SHOW_TEXT, "", WGT_FNT_MED, Font::ALIGN_CENTER, Font::ALIGN_CENTER );
widget_manager->insert_column();
widget_manager->add_wgt(WTOK_SINGLE, 25, 7);
widget_manager->set_wgt_text( WTOK_SINGLE, _("Single Player") );
widget_manager->break_line();
widget_manager->add_wgt(WTOK_MULTI, 25, 7);
widget_manager->set_wgt_text( WTOK_MULTI, _("Multiplayer") );
widget_manager->break_line();
widget_manager->add_wgt(WTOK_OPTIONS, 25, 7);
widget_manager->set_wgt_text( WTOK_OPTIONS, _("Options") );
widget_manager->break_line();
widget_manager->add_wgt(WTOK_QUIT, 25, 7);
widget_manager->set_wgt_text( WTOK_QUIT, _("Quit") );
widget_manager->break_line();
widget_manager->add_wgt(WTOK_EMPTY, 25, 7);
widget_manager->hide_wgt_text( WTOK_EMPTY );
widget_manager->hide_wgt_rect( WTOK_EMPTY );
widget_manager->deactivate_wgt( WTOK_EMPTY );
widget_manager->break_line();
widget_manager->add_wgt(WTOK_HELP, 25, 7);
widget_manager->set_wgt_text( WTOK_HELP, _("Help") );
//FIXME: if text size is not set, we get a crash when resizing the rect to the text
widget_manager->set_wgt_text_size( WTOK_HELP, WGT_FNT_SML );
widget_manager->break_line();
widget_manager->add_wgt(WTOK_CREDITS, 25, 7);
widget_manager->set_wgt_text( WTOK_CREDITS, _("Credits") );
@ -81,7 +76,7 @@ MainMenu::MainMenu()
//-----------------------------------------------------------------------------
MainMenu::~MainMenu()
{
widget_manager->delete_wgts() ;
widget_manager->reset();
}
//-----------------------------------------------------------------------------

2
src/gui/num_laps.cpp
View File

@ -108,7 +108,7 @@ NumLaps::NumLaps() : laps(3)
// -----------------------------------------------------------------------------
NumLaps::~NumLaps()
{
widget_manager->delete_wgts();
widget_manager->reset();
} // ~NumLaps
// -----------------------------------------------------------------------------

2
src/gui/num_players.cpp
View File

@ -72,7 +72,7 @@ NumPlayers::NumPlayers()
// -----------------------------------------------------------------------------
NumPlayers::~NumPlayers()
{
widget_manager->delete_wgts() ;
widget_manager->reset() ;
}
// -----------------------------------------------------------------------------

2
src/gui/options.cpp
View File

@ -107,7 +107,7 @@ Options::Options()
// -----------------------------------------------------------------------------
Options::~Options()
{
widget_manager->delete_wgts() ;
widget_manager->reset() ;
}
// -----------------------------------------------------------------------------

2
src/gui/player_controls.cpp
View File

@ -115,7 +115,7 @@ PlayerControls::PlayerControls(int whichPlayer):
//-----------------------------------------------------------------------------
PlayerControls::~PlayerControls()
{
widget_manager->delete_wgts();
widget_manager->reset();
// The unicode translation is not generally needed, so disable it again.
} // ~PlayerControls

2
src/gui/race_menu.cpp
View File

@ -85,7 +85,7 @@ RaceMenu::RaceMenu()
//-----------------------------------------------------------------------------
RaceMenu::~RaceMenu()
{
widget_manager->delete_wgts();
widget_manager->reset();
}

2
src/gui/race_results_gui.cpp
View File

@ -170,7 +170,7 @@ RaceResultsGUI::RaceResultsGUI()
//-----------------------------------------------------------------------------
RaceResultsGUI::~RaceResultsGUI()
{
widget_manager->delete_wgts();
widget_manager->reset();
//widgetSet -> delete_widget(m_menu_id) ;
delete[] m_score;
delete[] m_highscores;

2
src/gui/track_sel.cpp
View File

@ -101,7 +101,7 @@ TrackSel::TrackSel()
//-----------------------------------------------------------------------------
TrackSel::~TrackSel()
{
widget_manager->delete_wgts();
widget_manager->reset();
}
//-----------------------------------------------------------------------------

275
src/widget_manager.cpp
View File

@ -35,14 +35,13 @@ const int WidgetManager::WGT_NONE = -1;
WidgetManager::WidgetManager() :
m_x( -1 ), m_y( -1 ), m_selected_wgt_token( WGT_NONE )
{
restore_default_states();
init_fonts();
}
//-----------------------------------------------------------------------------
WidgetManager::~WidgetManager()
{
delete_wgts();
reset();
delete_fonts();
}
@ -122,6 +121,7 @@ bool WidgetManager::insert_column()
{
if( NUM_WGTS > 0 )
{
//FIXME: check if a column is inside a column instead
std::cerr << "Warning: tried to add a column twice at " <<
"widget with token" << m_widgets[NUM_WGTS - 1].token <<
".\n";
@ -154,6 +154,18 @@ bool WidgetManager::break_line()
return false;
}
const int LAST_COLUMN = m_columns.size() - 1;
if( LAST_COLUMN > -1 && m_columns[LAST_COLUMN] == LAST_WGT )
{
std::cerr << "Warning: tried to add a column with just one widget" <<
".\n";
//The last column is removed, because it would screw up the layout.
m_columns.pop_back();
return false;
}
const int NUM_BREAKS = m_breaks.size();
if( NUM_BREAKS > 0 )
@ -176,7 +188,7 @@ bool WidgetManager::break_line()
//-----------------------------------------------------------------------------
void WidgetManager::delete_wgts()
void WidgetManager::reset()
{
const int NUM_WIDGETS = m_widgets.size();
@ -186,6 +198,10 @@ void WidgetManager::delete_wgts()
}
m_widgets.clear();
restore_default_states();
m_breaks.clear();
m_columns.clear();
}
//-----------------------------------------------------------------------------
@ -425,11 +441,8 @@ bool WidgetManager::layout(const WidgetArea POSITION)
break;
}
int line_height = calc_line_height(0);
//m_y should be the bottom value of the widgets, because that's the way
//OpenGL handles the y-axis.
m_y -= line_height;
//TODO: fix if m_x or m_y is bigger than the screen.
@ -443,30 +456,98 @@ bool WidgetManager::layout(const WidgetArea POSITION)
//The widgets positions given are for the lower left corner.
int widget_x = m_x + ( WGTS_WIDTH - calc_line_width( 0 )) / 2;
int widget_y = m_y;
int widget_y = m_y - m_widgets[0].widget->m_height;
bool column_begins = false;
int column_first_wgt = WGT_NONE;
//The important part of the function: give each widget it's true position
//on the screen and create their rect.
for( int i = 0; i < NUM_WIDGETS; ++i )
{
//Assign the widget's position
m_widgets[i].widget->m_x = widget_x;
m_widgets[i].widget->m_y = widget_y + (line_height - m_widgets[i].widget->m_height);
m_widgets[i].widget->m_y = widget_y;
//Create widget's rect
if( !(m_widgets[i].widget->create_rect(RADIUS)) )
{
return false;
}
//Calculate the position of the next widget; this is not done if
//there are no more widgets left.
if( i + 1 < NUM_WIDGETS )
{
//Check if the i widget is the start of a column
column_begins = column_starts(i);
if( column_begins ) column_first_wgt = i;
//Column handling
if( column_first_wgt != WGT_NONE )
{
//Line breaks inside columns mark the end of them, so they
//behave differently if they are inside or outside of a
//column
if( line_breaks(i) )
{
widget_x += calc_column_width(column_first_wgt);
//Move the y pos back to the same height of the first wgt
//of the column.
widget_y += calc_column_height(column_first_wgt) -
m_widgets[i].widget->m_height;
if(!column_begins) column_first_wgt = WGT_NONE;
}
else
{
widget_y -= m_widgets[i].widget->m_height;
}
}
else //What to do if we are not into a column
{
if( line_breaks(i) )
{
const int CENTERED_POS = (WGTS_WIDTH -
calc_line_width( i+1 )) / 2;
widget_x = m_x + CENTERED_POS;
widget_y -= m_widgets[i+1].widget->m_height;
}
else
{
widget_x += m_widgets[i].widget->m_width;
}
}
//----
#if 0
if( line_breaks(i) )
{
line_height = calc_line_height(i+1);
widget_y -= line_height;
widget_x = m_x + ( WGTS_WIDTH - calc_line_width( i+1 )) / 2;
if( inside_column )
{
widget_y += column_height;
inside_column = false;
}
widget_y -= m_widgets[i].widget->m_height;
}
else
else if( inside_column )
{
widget_x += m_widgets[i].widget->m_width;
widget_y -= m_widgets[i].widget->m_height;
}
else widget_x += m_widgets[i].widget->m_width;
if( column_starts(i) )
{
widget_y -= m_widgets[i].widget->m_height;
widget_x -= m_widgets[i].widget->m_width;
column_height = calc_column_height(i);
inside_column = true;
}
#endif
}
}
@ -480,10 +561,6 @@ bool WidgetManager::layout(const WidgetArea POSITION)
}
}
//Cleanups
m_breaks.clear();
restore_default_states();
return true;
}
@ -495,8 +572,17 @@ int WidgetManager::calc_line_width( const int START_WGT ) const
for( int i = START_WGT; i < NUM_WIDGETS; ++i )
{
total_width += m_widgets[i].widget->m_width;
if( line_breaks(i) ) break;
if( column_starts(i) )
{
total_width += calc_column_width(i);
while( !line_breaks(i) && i < NUM_WIDGETS ) ++i;
}
else
{
total_width += m_widgets[i].widget->m_width;
if( line_breaks(i) ) break;
}
}
return total_width;
@ -572,7 +658,8 @@ void WidgetManager::set_selected_wgt(const int TOKEN)
{
m_selected_wgt_token = TOKEN;
}
else std::cerr << "Tried to select unexistant widget with token " << TOKEN << '\n';
else std::cerr << "Warning: tried to select unnamed widget with " <<
token << TOKEN << '\n';
}
@ -666,7 +753,11 @@ void WidgetManager::activate_wgt(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].active = true;
else std::cerr << "Tried to activate unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to activate unnamed widget with token "
<< TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -674,7 +765,11 @@ void WidgetManager::deactivate_wgt(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].active = false;
else std::cerr << "Tried to deactivate unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to deactivate unnamed widget with " <<
<< TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -682,7 +777,11 @@ void WidgetManager::set_wgt_color(const int TOKEN, const GLfloat *COLOR)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_rect_color = COLOR;
else std::cerr << "Tried to change the rect color of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to change the rect color of an " <<
"unnamed widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -690,14 +789,22 @@ void WidgetManager::set_wgt_round_corners(const int TOKEN, const WidgetArea CORN
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_round_corners = CORNERS;
else std::cerr << "Tried to change the round corners of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to change the round corners of an " <<
"unnamed widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
void WidgetManager::show_wgt_rect(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_rect = true;
else std::cerr << "Tried to show the rect of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to show the rect of an unnamed widget "
<< "with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -705,7 +812,11 @@ void WidgetManager::hide_wgt_rect(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_rect = false;
else std::cerr << "Tried to hide the rect of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to hide the rect of an unnamed widget "
<< "with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -713,7 +824,7 @@ void WidgetManager::hide_wgt_rect(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->toggle_rect();
else std::cerr << "Tried to toggle the rect of an unexistant widget with token " << TOKEN << '\n';
else std::cerr << "Tried to toggle the rect of an unnamed widget with token " << TOKEN << '\n';
}*/
//-----------------------------------------------------------------------------
@ -721,7 +832,11 @@ void WidgetManager::set_wgt_texture(const int TOKEN, const int TEXTURE)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_texture = TEXTURE;
else std::cerr << "Tried to set the texture of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the texture of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -729,7 +844,11 @@ void WidgetManager::show_wgt_texture(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_texture = true;
else std::cerr << "Tried to show the texture of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to show the texture of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -737,7 +856,11 @@ void WidgetManager::hide_wgt_texture(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_texture = false;
else std::cerr << "Tried to hide the texture of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to hide the texture of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -745,7 +868,7 @@ void WidgetManager::hide_wgt_texture(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->toggle_texture();
else std::cerr << "Tried to toggle the texture of an unexistant widget with token " << TOKEN << '\n';
else std::cerr << "Tried to toggle the texture of an unnamed widget with token " << TOKEN << '\n';
}
*/
//-----------------------------------------------------------------------------
@ -753,7 +876,11 @@ void WidgetManager::set_wgt_text( const int TOKEN, const char* TEXT )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_text = TEXT;
else std::cerr << "Tried to set text to an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set text to an unnamed widget " <<
"with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -761,7 +888,11 @@ void WidgetManager::set_wgt_text( const int TOKEN, const std::string TEXT )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_text = TEXT;
else std::cerr << "Tried to set the text of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the text of an unnamed widget with " <<
"token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -769,7 +900,11 @@ void WidgetManager::set_wgt_text_size( const int TOKEN, const WidgetFontSize SIZ
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_text_size = SIZE;
else std::cerr << "Tried to set the text size of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the text size of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -777,7 +912,11 @@ void WidgetManager::show_wgt_text( const int TOKEN )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_text = true;
else std::cerr << "Tried to show the text of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to show the text of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -785,7 +924,11 @@ void WidgetManager::hide_wgt_text( const int TOKEN )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_text = false;
else std::cerr << "Tried to hide the text of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to hide the text of an unnamed widget " <<
"with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -793,7 +936,7 @@ void WidgetManager::hide_wgt_text( const int TOKEN )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->toggle_text();
else std::cerr << "Tried to toggle the text of an unexistant widget with token " << TOKEN << '\n';
else std::cerr << "Warning: tried to toggle the text of an unnamed widget with token " << TOKEN << '\n';
}*/
//-----------------------------------------------------------------------------
@ -801,7 +944,11 @@ void WidgetManager::set_wgt_text_x_alignment( const int TOKEN, const Font::FontA
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_text_x_alignment = ALIGN;
else std::cerr << "Tried to set the X alignment of text of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the X alignment of text of " <<
"an unnamed widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -809,7 +956,11 @@ void WidgetManager::set_wgt_text_y_alignment( const int TOKEN, const Font::FontA
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_text_y_alignment = ALIGN;
else std::cerr << "Tried to set the Y alignment of text of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the Y alignment of text of " <<
"an unnamed widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -817,7 +968,11 @@ void WidgetManager::enable_wgt_scroll( const int TOKEN )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_scroll = true;
else std::cerr << "Tried to enable scrolling of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to enable scrolling of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -825,7 +980,11 @@ void WidgetManager::disable_wgt_scroll( const int TOKEN )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_enable_scroll = false;
else std::cerr << "Tried to disable scrolling of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to disable scrolling of an unnamed " <<
"widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -833,7 +992,7 @@ void WidgetManager::disable_wgt_scroll( const int TOKEN )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_scroll_pos_x = POS;
else std::cerr << "Tried to set the X scroll position of an unexistant widget with token " << TOKEN << '\n';
else std::cerr << "Tried to set the X scroll position of an unnamed widget with token " << TOKEN << '\n';
}*/
//-----------------------------------------------------------------------------
@ -841,7 +1000,11 @@ void WidgetManager::set_wgt_y_scroll_pos( const int TOKEN, const int POS )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_scroll_pos_y = POS;
else std::cerr << "Tried to set the Y scroll position of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the Y scroll position of an " <<
"unnamed widget with token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -849,7 +1012,7 @@ void WidgetManager::set_wgt_y_scroll_pos( const int TOKEN, const int POS )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_scroll_speed_x = SPEED;
else std::cerr << "Tried to set the X scroll speed of an unexistant widget with token " << TOKEN << '\n';
else std::cerr << "Tried to set the X scroll speed of an unnamed widget with token " << TOKEN << '\n';
}*/
//-----------------------------------------------------------------------------
@ -857,7 +1020,11 @@ void WidgetManager::set_wgt_y_scroll_speed( const int TOKEN, const int SPEED )
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->m_scroll_speed_y = SPEED;
else std::cerr << "Tried to set the Y scroll speed of an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to set the Y scroll speed of an " <<
"unnamed widget with token " << TOKEN << '\n';
}
}
/** pulse_widget() passes the pulse order to the right widget.
@ -866,7 +1033,11 @@ void WidgetManager::pulse_wgt(const int TOKEN) const
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->pulse();
else std::cerr << "Tried to pulse unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to pulse unnamed widget with token " <<
TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -874,7 +1045,11 @@ void WidgetManager::lighten_wgt_color(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->lighten_color();
else std::cerr << "Tried to lighten an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to lighten an unnamed widget with " <<
"token " << TOKEN << '\n';
}
}
//-----------------------------------------------------------------------------
@ -882,7 +1057,11 @@ void WidgetManager::darken_wgt_color(const int TOKEN)
{
const int ID = find_id(TOKEN);
if( ID != WGT_NONE ) m_widgets[ID].widget->darken_color();
else std::cerr << "Tried to darken an unexistant widget with token " << TOKEN << '\n';
else
{
std::cerr << "Warning: tried to darken an unnamed widget with " <<
"token " << TOKEN << '\n';
}
}
/** The handle_pointer() function returns the current widget under the

10
src/widget_manager.hpp
View File

@ -36,7 +36,7 @@
*
* You can use set_initial_*state() to avoid setting the state of the same
* switch features with same values over and over; the default states are
* reset when you call layout() or you can use reset_default_states().
* reset when you call reset() or you can use reset_default_states().
*/
@ -120,13 +120,13 @@ public:
//right and top to bottom of the widgets at line
//breaks, and switches it, making it from top to
//bottom, and left to right at a line break,
//until the next line break or the next layout()
//call. It can only be used right at the beginning
//until the next line break or reset() call. It can
//only be used right at the beginning
//of a line (that is, before any widgets have been
//created, or just after a line break).
bool break_line();
void delete_wgts();
void reset();
void update(const float DELTA);
@ -197,7 +197,7 @@ public:
int handle_right();
int handle_up();
int handle_down();
/* Scrolling modification. */
void increase_scroll_speed(bool = false);
void decrease_scroll_speed(bool = false);