[Supertuxkart-commit] SF.net SVN: supertuxkart:[3663] main/branches/irrlicht/src/gui

[<au...@us...>]

Revision: 3663
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3663&view=rev
Author:   auria
Date:     2009-06-28 20:07:06 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
Implemented 'press esc to cancel' buttons in some modal dialogs

Modified Paths:
--------------
    main/branches/irrlicht/src/gui/modaldialog.cpp
    main/branches/irrlicht/src/gui/modaldialog.hpp
    main/branches/irrlicht/src/gui/screen.cpp

Modified: main/branches/irrlicht/src/gui/modaldialog.cpp
===================================================================
--- main/branches/irrlicht/src/gui/modaldialog.cpp	2009-06-28 13:26:24 UTC (rev 3662)
+++ main/branches/irrlicht/src/gui/modaldialog.cpp	2009-06-28 20:07:06 UTC (rev 3663)
@@ -21,6 +21,7 @@
 #include "gui/options_screen.hpp"
 #include "gui/state_manager.hpp"
 #include "gui/widget.hpp"
+#include "input/input_manager.hpp"
 #include "network/network_manager.hpp"
 #include "race/race_manager.hpp"
 #include "utils/translation.hpp"
@@ -108,19 +109,30 @@
     widget->add();
     
     
+    IGUIFont* font = GUIEngine::getFont();
+    const int textHeight = font->getDimension(L"X").Height;
+    
     ButtonWidget* widget2 = new ButtonWidget();
     widget2->m_type = WTYPE_BUTTON; // FIXME : shouldn't constructor set type?
-    widget2->m_properties[PROP_TEXT] = _("Press ESC to cancel"); // TODO : pressing this button should cancel
+    widget2->m_properties[PROP_ID] = "cancel";
+    widget2->m_properties[PROP_TEXT] = _("Press ESC to cancel");
     widget2->x = 15;
-    widget2->y = m_area.getHeight() - 60;
+    widget2->y = m_area.getHeight() - textHeight - 12;
     widget2->w = m_area.getWidth() - 30;
-    widget2->h = 50;
+    widget2->h = textHeight + 6;
     widget2->setParent(m_irrlicht_window);
     
     m_children.push_back(widget2);
     widget2->add();
 }
-
+void PressAKeyDialog::processEvent(std::string& eventSource)
+{
+    if(eventSource == "cancel")
+    {
+        input_manager->setMode(InputManager::MENU);
+        dismiss();
+    }
+}
 // ------------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------------
 
@@ -142,7 +154,7 @@
     widget->x = 0;
     widget->y = 0;
     widget->w = m_area.getWidth();
-    widget->h = m_area.getHeight()/2;
+    widget->h = m_area.getHeight()/3;
     widget->setParent(m_irrlicht_window);
     
     m_children.push_back(widget);
@@ -153,10 +165,7 @@
     IGUIFont* font = GUIEngine::getFont();
     const int textHeight = font->getDimension(L"X").Height;
     
-    const int bottomYFrom = m_area.getHeight()/2;
-    const int bottomYTo = m_area.getHeight();
-    const int bottomHeight = bottomYTo - bottomYFrom;
-    const int textAreaYFrom = bottomYFrom + bottomHeight/2 - textHeight/2;
+    const int textAreaYFrom = m_area.getHeight()/2 - textHeight/2;
     
     textCtrl = new TextBoxWidget();
     textCtrl->m_type = WTYPE_BUTTON;
@@ -169,14 +178,38 @@
     m_children.push_back(textCtrl);
     textCtrl->add();
     GUIEngine::getGUIEnv()->setFocus( textCtrl->m_element );
+    
+    ButtonWidget* widget2 = new ButtonWidget();
+    widget2->m_type = WTYPE_BUTTON; // FIXME : shouldn't constructor set type?
+    widget2->m_properties[PROP_ID] = "cancel";
+    widget2->m_properties[PROP_TEXT] = _("Press ESC to cancel");
+    widget2->x = 15;
+    widget2->y = m_area.getHeight() - textHeight - 12;
+    widget2->w = m_area.getWidth() - 30;
+    widget2->h = textHeight + 6;
+    widget2->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);
+    
 
 }
 EnterPlayerNameDialog::~EnterPlayerNameDialog()
 {
-    std::cout << "Rmoving text control element\n";
     textCtrl->m_element->remove();
 }
-
+void EnterPlayerNameDialog::processEvent(std::string& eventSource)
+{
+    if(eventSource == "cancel")
+    {
+        input_manager->setMode(InputManager::MENU);
+        dismiss();
+    }
+}
 // ------------------------------------------------------------------------------------------------------
 
 void EnterPlayerNameDialog::onEnterPressedInternal()

Modified: main/branches/irrlicht/src/gui/modaldialog.hpp
===================================================================
--- main/branches/irrlicht/src/gui/modaldialog.hpp	2009-06-28 13:26:24 UTC (rev 3662)
+++ main/branches/irrlicht/src/gui/modaldialog.hpp	2009-06-28 20:07:06 UTC (rev 3663)
@@ -48,6 +48,7 @@
     ptr_vector<Widget> m_children;
     
     virtual ~ModalDialog();
+    virtual void processEvent(std::string& eventSource){}
     
     static void dismiss();
     static void onEnterPressed();
@@ -62,6 +63,7 @@
      * Creates a modal dialog with given percentage of screen width and height
      */
     PressAKeyDialog(const float percentWidth, const float percentHeight);
+    void processEvent(std::string& eventSource);
 };
 
 class EnterPlayerNameDialog : public ModalDialog
@@ -75,6 +77,7 @@
     ~EnterPlayerNameDialog();
 
     void onEnterPressedInternal();
+    void processEvent(std::string& eventSource);
 };
 
 class TrackInfoDialog : public ModalDialog

Modified: main/branches/irrlicht/src/gui/screen.cpp
===================================================================
--- main/branches/irrlicht/src/gui/screen.cpp	2009-06-28 13:26:24 UTC (rev 3662)
+++ main/branches/irrlicht/src/gui/screen.cpp	2009-06-28 20:07:06 UTC (rev 3663)
@@ -651,6 +651,12 @@
                 Widget* w = getWidget(id);
                 if(w == NULL) break;
                 
+                if(ModalDialog::isADialogActive())
+                {
+                    ModalDialog::getCurrent()->processEvent(w->m_properties[PROP_ID]);
+                    return false;
+                }
+                
                 Widget* parent = w->m_event_handler;
                 if(w->m_event_handler != NULL)
                 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.