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

Small improvements to 'enter player' dialog code

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-06-28 20:22:49 +00:00
parent 33899210b2
commit ec8a77041d
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/modaldialog.cpp
View File

@ -136,11 +136,10 @@ void PressAKeyDialog::processEvent(std::string& eventSource)
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------
EnterPlayerNameDialog::EnterPlayerNameDialog(const float w, const float h) : EnterPlayerNameDialog::EnterPlayerNameDialog(const float w, const float h) :
ModalDialog(w, h) ModalDialog(w, h)
{ {
std::cout << "EnterPlayerName()\n";
//core::rect< s32 > area_top(0, 0, m_area.getWidth(), m_area.getHeight()/2); //core::rect< s32 > area_top(0, 0, m_area.getWidth(), m_area.getHeight()/2);
//IGUIStaticText* label = GUIEngine::getGUIEnv()->addStaticText( stringw(_("Enter the new player's name")).c_str(), //IGUIStaticText* label = GUIEngine::getGUIEnv()->addStaticText( stringw(_("Enter the new player's name")).c_str(),
// area_top, false /* border */, true /* word wrap */, // area_top, false /* border */, true /* word wrap */,
@ -179,23 +178,18 @@ EnterPlayerNameDialog::EnterPlayerNameDialog(const float w, const float h) :
textCtrl->add(); textCtrl->add();
GUIEngine::getGUIEnv()->setFocus( textCtrl->m_element ); GUIEngine::getGUIEnv()->setFocus( textCtrl->m_element );
ButtonWidget* widget2 = new ButtonWidget(); cancelButton = new ButtonWidget();
widget2->m_type = WTYPE_BUTTON; // FIXME : shouldn't constructor set type? cancelButton->m_type = WTYPE_BUTTON; // FIXME : shouldn't constructor set type?
widget2->m_properties[PROP_ID] = "cancel"; cancelButton->m_properties[PROP_ID] = "cancel";
widget2->m_properties[PROP_TEXT] = _("Press ESC to cancel"); cancelButton->m_properties[PROP_TEXT] = _("Press ESC to cancel");
widget2->x = 15; cancelButton->x = 15;
widget2->y = m_area.getHeight() - textHeight - 12; cancelButton->y = m_area.getHeight() - textHeight + 12;
widget2->w = m_area.getWidth() - 30; cancelButton->w = m_area.getWidth() - 30;
widget2->h = textHeight + 6; cancelButton->h = textHeight + 6;
widget2->setParent(m_irrlicht_window); cancelButton->setParent(m_irrlicht_window);
m_children.push_back(widget2);
widget2->add();
// don't allow navigating there with keyboard; pressing 'enter' will accept the current name
// no matter where focus is
widget2->m_element->setTabStop(false);
m_children.push_back(cancelButton);
cancelButton->add();
} }
EnterPlayerNameDialog::~EnterPlayerNameDialog() EnterPlayerNameDialog::~EnterPlayerNameDialog()
@ -208,12 +202,20 @@ void EnterPlayerNameDialog::processEvent(std::string& eventSource)
{ {
input_manager->setMode(InputManager::MENU); input_manager->setMode(InputManager::MENU);
dismiss(); dismiss();
return;
} }
} }
// ------------------------------------------------------------------------------------------------------
void EnterPlayerNameDialog::onEnterPressedInternal() void EnterPlayerNameDialog::onEnterPressedInternal()
{ {
// ---- Cancel button pressed
if( GUIEngine::getGUIEnv()->hasFocus(cancelButton->m_element) )
{
std::string fakeEvent = "cancel";
processEvent(fakeEvent);
return;
}
// ---- Otherwise, accept entered name
stringw playerName = textCtrl->getText(); stringw playerName = textCtrl->getText();
if(playerName.size() > 0) if(playerName.size() > 0)
StateManager::gotNewPlayerName( playerName ); StateManager::gotNewPlayerName( playerName );

2
src/gui/modaldialog.hpp
View File

@ -24,6 +24,7 @@ namespace GUIEngine
{ {
class Widget; class Widget;
class TextBoxWidget; class TextBoxWidget;
class ButtonWidget;
/** /**
* Base class, derive your own. * Base class, derive your own.
@ -69,6 +70,7 @@ public:
class EnterPlayerNameDialog : public ModalDialog class EnterPlayerNameDialog : public ModalDialog
{ {
TextBoxWidget* textCtrl; TextBoxWidget* textCtrl;
ButtonWidget* cancelButton;
public: public:
/** /**
* Creates a modal dialog with given percentage of screen width and height * Creates a modal dialog with given percentage of screen width and height