Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed displaying special chars in the keychange menu

Constantin Wenger 2011-08-02 10:44:25 +02:00 committed by Giuseppe Bilotta
parent 1278a57afe
commit 0cfca69b42
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/guiKeyChangeMenu.cpp
View File

@ -76,7 +76,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
recalculateAbsolutePosition(false); recalculateAbsolutePosition(false);
v2s32 topleft(0, 0); v2s32 topleft(0, 0);
changeCtype("");
{ {
core::rect < s32 > rect(0, 0, 125, 20); core::rect < s32 > rect(0, 0, 125, 20);
rect += topleft + v2s32(25, 3); rect += topleft + v2s32(25, 3);
@ -303,6 +303,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON, Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
wgettext("Cancel")); wgettext("Cancel"));
} }
changeCtype("C");
} }
void GUIKeyChangeMenu::drawMenu() void GUIKeyChangeMenu::drawMenu()
@ -417,6 +418,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0 if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0
&& event.KeyInput.PressedDown) && event.KeyInput.PressedDown)
{ {
changeCtype("");
if (activeKey == GUI_ID_KEY_FORWARD_BUTTON) if (activeKey == GUI_ID_KEY_FORWARD_BUTTON)
{ {
this->forward->setText( this->forward->setText(
@ -495,7 +497,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str()); narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
this->key_dump = event.KeyInput.Key; this->key_dump = event.KeyInput.Key;
} }
changeCtype("C");
activeKey = -1; activeKey = -1;
return true; return true;
} }
@ -514,6 +516,12 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
} }
if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED)
{ {
if(event.GUIEvent.Caller->getID() != GUI_ID_BACK_BUTTON &&
event.GUIEvent.Caller->getID() != GUI_ID_ABORT_BUTTON)
{
changeCtype("");
}
switch (event.GUIEvent.Caller->getID()) switch (event.GUIEvent.Caller->getID())
{ {
case GUI_ID_BACK_BUTTON: //back case GUI_ID_BACK_BUTTON: //back
@ -590,6 +598,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
break; break;
} }
//Buttons //Buttons
changeCtype("C");
} }
} }