From: <hik...@us...> - 2007-11-20 11:49:01
|
Revision: 1294 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1294&view=rev Author: hikerstk Date: 2007-11-20 03:49:00 -0800 (Tue, 20 Nov 2007) Log Message: ----------- Bugfix for crash when selecting a Grand Prix. Modified Paths: -------------- trunk/supertuxkart/src/gui/grand_prix_select.cpp Modified: trunk/supertuxkart/src/gui/grand_prix_select.cpp =================================================================== --- trunk/supertuxkart/src/gui/grand_prix_select.cpp 2007-11-20 02:13:53 UTC (rev 1293) +++ trunk/supertuxkart/src/gui/grand_prix_select.cpp 2007-11-20 11:49:00 UTC (rev 1294) @@ -134,7 +134,7 @@ glOrtho(0.0, user_config->m_width, 0.0, user_config->m_height, -1.0, +1.0); glMatrixMode(GL_MODELVIEW); glEnable(GL_BLEND); - const CupData &cup = m_all_cups[CLICKED_TOKEN]; + const CupData &cup = m_all_cups[CLICKED_TOKEN-WTOK_FIRSTPRIX]; glPushMatrix(); glBindTexture(GL_TEXTURE_2D, 0); const GLfloat BACKGROUND_COLOUR[4] = { 0.3f, 0.3f, 0.3f, 0.5f }; @@ -160,7 +160,7 @@ menu_manager->popMenu(); return; } - race_manager->setGrandPrix(m_all_cups[CLICKED_TOKEN]); + race_manager->setGrandPrix(m_all_cups[CLICKED_TOKEN-WTOK_FIRSTPRIX]); menu_manager->pushMenu(MENUID_DIFFICULTY); } // select This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cos...@us...> - 2007-12-12 14:27:02
|
Revision: 1346 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1346&view=rev Author: cosmosninja Date: 2007-12-12 06:26:55 -0800 (Wed, 12 Dec 2007) Log Message: ----------- Grand Prix selection screen's description is centered again, plus minor cleanups. Modified Paths: -------------- trunk/supertuxkart/src/gui/grand_prix_select.cpp Modified: trunk/supertuxkart/src/gui/grand_prix_select.cpp =================================================================== --- trunk/supertuxkart/src/gui/grand_prix_select.cpp 2007-12-12 14:07:26 UTC (rev 1345) +++ trunk/supertuxkart/src/gui/grand_prix_select.cpp 2007-12-12 14:26:55 UTC (rev 1346) @@ -69,14 +69,6 @@ m_all_cups.push_back(cup); widget_manager->add_wgt(WTOK_FIRSTPRIX + nId, 40, 7); widget_manager->set_wgt_text(WTOK_FIRSTPRIX + nId, cup.getName()); -/* if(nId==0) - { - widgetSet -> start(m_menu_id, cup.getName(), GUI_SML, nId, 0); - } - else - { - widgetSet -> state(m_menu_id, cup.getName(), GUI_SML, nId, 0); - }*/ nId++; } // if } // for i @@ -101,15 +93,12 @@ widget_manager->activate_wgt(WTOK_QUIT); widget_manager->layout(WGT_AREA_ALL); - //m_rect = widgetSet->rect(10, 10, user_config->m_width-20, 34, GUI_ALL, 10);*/ } // GrandPrixSelect //----------------------------------------------------------------------------- GrandPrixSelect::~GrandPrixSelect() { widget_manager->reset(); -// widgetSet -> delete_widget(m_menu_id) ; -// glDeleteLists(m_rect, 1); } // GrandPrixSelect //----------------------------------------------------------------------------- @@ -121,6 +110,7 @@ const CupData &cup = m_all_cups[CLICKED_TOKEN - WTOK_FIRSTPRIX]; widget_manager->set_wgt_text(WTOK_DESCRIPTION, cup.getDescription()); + widget_manager->set_wgt_x_scroll_pos( WTOK_DESCRIPTION, WGT_SCROLL_CENTER ); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2008-05-15 03:00:56
|
Revision: 1899 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1899&view=rev Author: hikerstk Date: 2008-05-14 20:00:54 -0700 (Wed, 14 May 2008) Log Message: ----------- Removed rectangle around non-selectable text. Modified Paths: -------------- trunk/supertuxkart/src/gui/grand_prix_select.cpp Modified: trunk/supertuxkart/src/gui/grand_prix_select.cpp =================================================================== --- trunk/supertuxkart/src/gui/grand_prix_select.cpp 2008-05-15 02:53:03 UTC (rev 1898) +++ trunk/supertuxkart/src/gui/grand_prix_select.cpp 2008-05-15 03:00:54 UTC (rev 1899) @@ -70,6 +70,7 @@ widget_manager->addTextWgt( WTOK_DESCRIPTION, 80, 7, _("No Grand Prix selected") ); widget_manager->setWgtTextSize(WTOK_DESCRIPTION, WGT_FNT_SML); + widget_manager->hideWgtRect(WTOK_DESCRIPTION); widget_manager->breakLine(); widget_manager->breakLine(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cos...@us...> - 2008-05-25 16:52:15
|
Revision: 2049 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=2049&view=rev Author: cosmosninja Date: 2008-05-25 09:52:08 -0700 (Sun, 25 May 2008) Log Message: ----------- Increased the size of the widgets in the grand prix selection to avoid problems with italian translation. Modified Paths: -------------- trunk/supertuxkart/src/gui/grand_prix_select.cpp Modified: trunk/supertuxkart/src/gui/grand_prix_select.cpp =================================================================== --- trunk/supertuxkart/src/gui/grand_prix_select.cpp 2008-05-25 16:13:50 UTC (rev 2048) +++ trunk/supertuxkart/src/gui/grand_prix_select.cpp 2008-05-25 16:52:08 UTC (rev 2049) @@ -61,7 +61,7 @@ CupData cup(*i); if(unlock_manager->isLocked(cup.getName())) continue; m_all_cups.push_back(cup); - widget_manager->addTextButtonWgt(WTOK_FIRSTPRIX + nId, 40, 7, cup.getName() ); + widget_manager->addTextButtonWgt(WTOK_FIRSTPRIX + nId, 60, 7, cup.getName() ); nId++; } // if } // for i @@ -74,7 +74,7 @@ widget_manager->breakLine(); widget_manager->breakLine(); - widget_manager->addTextWgt( WTOK_TRACKS, 40, 40, _("No Grand Prix selected")); + widget_manager->addTextWgt( WTOK_TRACKS, 60, 40, _("No Grand Prix selected")); widget_manager->enableWgtScroll( WTOK_TRACKS ); widget_manager->setWgtYScrollSpeed( WTOK_TRACKS, -60 ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |