projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
guiKeyChangeMenu.cpp
diff --git
a/src/guiKeyChangeMenu.cpp
b/src/guiKeyChangeMenu.cpp
index c660ed870be829f835c6093a7141960f63733c7b..85222431e0bf41d241a3888cb2ca5ccccf56c7a3 100644
(file)
--- a/
src/guiKeyChangeMenu.cpp
+++ b/
src/guiKeyChangeMenu.cpp
@@
-113,7
+113,7
@@
void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
recalculateAbsolutePosition(false);
v2s32 topleft(0, 0);
recalculateAbsolutePosition(false);
v2s32 topleft(0, 0);
- changeCtype("");
+
{
core::rect < s32 > rect(0, 0, 600, 40);
rect += topleft + v2s32(25, 3);
{
core::rect < s32 > rect(0, 0, 600, 40);
rect += topleft + v2s32(25, 3);
@@
-196,9
+196,7
@@
void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
text );
delete[] text;
Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
text );
delete[] text;
- }
- changeCtype("C");
-
+ }
}
void GUIKeyChangeMenu::drawMenu()
}
void GUIKeyChangeMenu::drawMenu()
@@
-265,7
+263,7
@@
bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0
&& event.KeyInput.PressedDown)
{
if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0
&& event.KeyInput.PressedDown)
{
- changeCtype("");
+
bool prefer_character = shift_down;
KeyPress kp(event.KeyInput, prefer_character);
bool prefer_character = shift_down;
KeyPress kp(event.KeyInput, prefer_character);
@@
-313,7
+311,6
@@
bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
this->key_used.push_back(kp);
this->key_used.push_back(kp);
- changeCtype("C");
// Allow characters made with shift
if(shift_went_down){
shift_down = true;
// Allow characters made with shift
if(shift_went_down){
shift_down = true;
@@
-339,12
+336,6
@@
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())
{
case GUI_ID_BACK_BUTTON: //back
switch (event.GUIEvent.Caller->getID())
{
case GUI_ID_BACK_BUTTON: //back
@@
-377,8
+368,6
@@
bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
break;
}
Environment->setFocus(this);
break;
}
Environment->setFocus(this);
- //Buttons
- changeCtype("C");
}
}
return Parent ? Parent->OnEvent(event) : false;
}
}
return Parent ? Parent->OnEvent(event) : false;