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

Fixes 'not being able to select the quit button' bug in the race menu.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja
2008-03-20 14:32:20 +00:00
parent 39e56e7534
commit d17cb88850
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/widget_manager.cpp
View File

@@ -1298,7 +1298,7 @@ int WidgetManager::handlePointer(const int X, const int Y )
{
if(!(m_widgets[i].active)) continue;
glLoadName( m_widgets[i].token );
glLoadName( i );
glPushMatrix();
m_widgets[i].widget->applyTransformations();
@@ -1323,29 +1323,36 @@ int WidgetManager::handlePointer(const int X, const int Y )
{
float dist;
float near_dist = 9999999.0f;
int nearest = WGT_NONE;
int curr_wgt_id;
int nearest_id = WGT_NONE;
int wgt_x_center, wgt_y_center;
int curr_wgt;
for( int i = 0; i < NUM_HITS; ++i )
{
position += 3;
curr_wgt = *position;
curr_wgt_id = *position;
wgt_x_center = m_widgets[curr_wgt_id].widget->m_x +
m_widgets[i].widget->m_width / 2;
wgt_y_center = m_widgets[curr_wgt_id].widget->m_y +
m_widgets[i].widget->m_height / 2;
wgt_x_center = m_widgets[curr_wgt].widget->m_x + m_widgets[i].widget->m_width / 2;
wgt_y_center = m_widgets[curr_wgt].widget->m_y + m_widgets[i].widget->m_height / 2;
//Check if it's the closest one to the mouse
dist = (float)( abs(X - wgt_x_center) + abs(Y - wgt_y_center));
if(dist < near_dist )
{
near_dist = dist;
nearest = curr_wgt;
nearest_id = curr_wgt_id;
}
++position;
}
if( nearest == m_selected_wgt_token ) return WGT_NONE;
m_selected_wgt_token = nearest;
if( m_widgets[nearest_id].token == m_selected_wgt_token )
{
return WGT_NONE;
}
m_selected_wgt_token = m_widgets[nearest_id].token;
return m_selected_wgt_token;
}