Formspec: Add container[] and container_end[] elements

[minetest.git] / src / guiKeyChangeMenu.cpp

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 3ddb3f5d9e21a99bf6ee5a1899b2c8738498b201..07137d1bc9be06446cf133d567f4a4c4a65d1178 100644 (file)
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -22,7 +22,6 @@
 #include "guiKeyChangeMenu.h"
 #include "debug.h"
 #include "serialization.h"
-#include "main.h"
 #include <string>
 #include <IGUICheckBox.h>
 #include <IGUIEditBox.h>
@@ -60,6 +59,7 @@ enum
        GUI_ID_KEY_INVENTORY_BUTTON,
        GUI_ID_KEY_DUMP_BUTTON,
        GUI_ID_KEY_RANGE_BUTTON,
+       GUI_ID_KEY_ZOOM_BUTTON,
        // other
        GUI_ID_CB_AUX1_DESCENDS,
        GUI_ID_CB_DOUBLETAP_JUMP,
@@ -82,7 +82,7 @@ GUIKeyChangeMenu::~GUIKeyChangeMenu()
        removeChildren();
 
        for (std::vector<key_setting*>::iterator iter = key_settings.begin();
-                       iter != key_settings.end(); iter ++) {
+                       iter != key_settings.end(); ++iter) {
                delete[] (*iter)->button_name;
                delete (*iter);
        }
@@ -138,7 +138,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        {
                key_setting *k = key_settings.at(i);
                {
-                       core::rect < s32 > rect(0, 0, 110, 20);
+                       core::rect < s32 > rect(0, 0, 150, 20);
                        rect += topleft + v2s32(offset.X, offset.Y);
                        Environment->addStaticText(k->button_name, rect, false, true, this, -1);
                }
@@ -188,7 +188,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 
        {
                core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40);
+               rect += topleft + v2s32(size.X / 2 - 105, size.Y - 40);
                const wchar_t *text =  wgettext("Save");
                Environment->addButton(rect, this, GUI_ID_BACK_BUTTON,
                                 text);
@@ -196,7 +196,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        }
        {
                core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40);
+               rect += topleft + v2s32(size.X / 2 + 5, size.Y - 40);
                const wchar_t *text = wgettext("Cancel");
                Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
                                text);
@@ -270,8 +270,7 @@ bool GUIKeyChangeMenu::resetMenu()
 bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 {
        if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0
-               && event.KeyInput.PressedDown)
-       {
+                       && event.KeyInput.PressedDown) {
                
                bool prefer_character = shift_down;
                KeyPress kp(event.KeyInput, prefer_character);
@@ -329,9 +328,12 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                                return true;
                        }
                }
-       }
-       if (event.EventType == EET_GUI_EVENT)
-       {
+       } else if (event.EventType == EET_KEY_INPUT_EVENT && activeKey < 0
+                       && event.KeyInput.PressedDown
+                       && event.KeyInput.Key == irr::KEY_ESCAPE) {
+               quitMenu();
+               return true;
+       } else if (event.EventType == EET_GUI_EVENT) {
                if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST
                        && isVisible())
                {
@@ -413,5 +415,6 @@ void GUIKeyChangeMenu::init_keys()
        this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
        this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");
        this->add_key(GUI_ID_KEY_DUMP_BUTTON,      wgettext("Print stacks"),     "keymap_print_debug_stacks");
+       this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
 }