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

Improved player info dialog, with a cancel button, and by putting the delete button apart

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-07-03 17:24:44 +00:00
parent 55a282c829
commit 1f2f028104
2 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/modaldialog.cpp
View File

@@ -322,9 +322,10 @@ PlayerInfoDialog::PlayerInfoDialog(Player* player, const float w, const float h)
{
m_player = player;
const int y1 = m_area.getHeight()/4;
const int y2 = m_area.getHeight()*2/4;
const int y3 = m_area.getHeight()*3/4;
const int y1 = m_area.getHeight()/6;
const int y2 = m_area.getHeight()*2/6;
const int y3 = m_area.getHeight()*3/6;
const int y4 = m_area.getHeight()*5/6;
IGUIFont* font = GUIEngine::getFont();
const int textHeight = font->getDimension(L"X").Height;
@@ -361,6 +362,22 @@ PlayerInfoDialog::PlayerInfoDialog(Player* player, const float w, const float h)
m_children.push_back(widget);
widget->add();
}
{
ButtonWidget* widget = new ButtonWidget();
widget->m_type = WTYPE_BUTTON;
widget->m_properties[PROP_ID] = "cancel";
widget->m_properties[PROP_TEXT] = _("Cancel");
const int textWidth = font->getDimension( stringw(widget->m_properties[PROP_TEXT].c_str()).c_str() ).Width + 40;
widget->x = m_area.getWidth()/2 - textWidth/2;
widget->y = y3;
widget->w = textWidth;
widget->h = buttonHeight;
widget->setParent(m_irrlicht_window);
m_children.push_back(widget);
widget->add();
}
{
ButtonWidget* widget = new ButtonWidget();
@@ -371,7 +388,7 @@ PlayerInfoDialog::PlayerInfoDialog(Player* player, const float w, const float h)
const int textWidth = font->getDimension( stringw(widget->m_properties[PROP_TEXT].c_str()).c_str() ).Width + 40;
widget->x = m_area.getWidth()/2 - textWidth/2;
widget->y = y3;
widget->y = y4;
widget->w = textWidth;
widget->h = buttonHeight;
widget->setParent(m_irrlicht_window);
@@ -379,7 +396,6 @@ PlayerInfoDialog::PlayerInfoDialog(Player* player, const float w, const float h)
widget->add();
}
// TODO : add cancel button
}
void PlayerInfoDialog::onEnterPressedInternal()
{
@@ -406,7 +422,9 @@ void PlayerInfoDialog::processEvent(std::string& eventSource)
return;
}
if(eventSource == "removeplayer")
{
{
// FIXME : ask for confirmation
StateManager::deletePlayer( m_player );
// irrLicht is too stupid to remove focus from deleted widgets
@@ -418,6 +436,18 @@ void PlayerInfoDialog::processEvent(std::string& eventSource)
return;
}
if(eventSource == "cancel")
{
// irrLicht is too stupid to remove focus from deleted widgets
// so do it by hand
GUIEngine::getGUIEnv()->removeFocus( textCtrl->m_element );
GUIEngine::getGUIEnv()->removeFocus( m_irrlicht_window );
ModalDialog::dismiss();
return;
}
}
}

2
src/gui/options_screen.cpp
View File

@@ -321,7 +321,7 @@ namespace StateManager
{
if(UserConfigParams::m_player[n].getName() == selectedPlayer)
{
new PlayerInfoDialog( &UserConfigParams::m_player[n], 0.5f, 0.4f );
new PlayerInfoDialog( &UserConfigParams::m_player[n], 0.5f, 0.6f );
return;
}
} // end for