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

Fixed incorrect display when only two tracks are displayed.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-01-29 11:00:11 +00:00
parent f90042e2ff
commit 113747ab07
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/track_sel.cpp
View File

@ -142,8 +142,12 @@ void TrackSel::updateScrollPosition()
widget_manager->showWgtText(WTOK_TRACK0+i);
int i_with_scrolling = i+m_offset;
if(i_with_scrolling < 0) i_with_scrolling += m_index_avail_tracks.size();
int indx = m_index_avail_tracks[ i_with_scrolling%m_index_avail_tracks.size() ];
while(i_with_scrolling < 0) i_with_scrolling += m_index_avail_tracks.size();
while(i_with_scrolling >=(int)m_index_avail_tracks.size() )
i_with_scrolling -= m_index_avail_tracks.size();
// We can't use simply % here, since e.g. 4 % 2 = 2 (probably because of
// the unsigned involved).
int indx = m_index_avail_tracks[ i_with_scrolling];
if(indx>=0)
{
const Track *track = track_manager->getTrack(indx);
@ -226,6 +230,8 @@ void TrackSel::switchGroup()
//-----------------------------------------------------------------------------
void TrackSel::displayImages(int selected_track)
{
if(m_current_track==-1)
printf("current %d new %d\n", m_current_track, selected_track);
if( m_current_track == selected_track) return;
m_current_track = selected_track;
if(selected_track<0)
@ -337,9 +343,11 @@ void TrackSel::update(float dt)
indx = m_offset + indx;
// Don't use modulo here, otherwise (one extreme short lists, e.g. 1 track,
// 1 group, the track is selected when hovering over invisible menu entries
if(indx< 0 ) indx += m_index_avail_tracks.size();
if(indx>=(int)m_index_avail_tracks.size()) indx -= m_index_avail_tracks.size();
// 1 group, the track is selected when hovering over invisible menu entries.
// While is necessary, e.g. with two tracks index can be 4, i.e. the
// subtraction must be done more than once.
while(indx< 0 ) indx += m_index_avail_tracks.size();
while(indx>=(int)m_index_avail_tracks.size()) indx -= m_index_avail_tracks.size();
if(indx<0 || indx >= (int)m_index_avail_tracks.size())
{
widget_manager->update(dt);