Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve password change menu (#5757) 

- Fix the GUI getting messed up when resizing
- Save the input when resizing
master
red-001 2017-05-20 11:29:44 +01:00 committed by Loïc Blot
parent 605599b6f1
commit 1ff5ee0b69
2 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/guiPasswordChange.cpp
View File

@ -41,7 +41,10 @@ GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment* env,
Client* client Client* client
): ):
GUIModalMenu(env, parent, id, menumgr), GUIModalMenu(env, parent, id, menumgr),
m_client(client) m_client(client),
m_oldpass(L""),
m_newpass(L""),
m_newpass_confirm(L"")
{ {
} }
@ -52,35 +55,24 @@ GUIPasswordChange::~GUIPasswordChange()
void GUIPasswordChange::removeChildren() void GUIPasswordChange::removeChildren()
{ {
{ const core::list<gui::IGUIElement *> &children = getChildren();
gui::IGUIElement *e = getElementFromId(ID_oldPassword); core::list<gui::IGUIElement *> children_copy;
if (e != NULL) for (core::list<gui::IGUIElement *>::ConstIterator i = children.begin();
e->remove(); i != children.end(); i++) {
children_copy.push_back(*i);
} }
{ for (core::list<gui::IGUIElement *>::Iterator i = children_copy.begin();
gui::IGUIElement *e = getElementFromId(ID_newPassword1); i != children_copy.end(); i++) {
if (e != NULL) (*i)->remove();
e->remove();
}
{
gui::IGUIElement *e = getElementFromId(ID_newPassword2);
if (e != NULL)
e->remove();
}
{
gui::IGUIElement *e = getElementFromId(ID_change);
if (e != NULL)
e->remove();
}
{
gui::IGUIElement *e = getElementFromId(ID_cancel);
if (e != NULL)
e->remove();
} }
} }
void GUIPasswordChange::regenerateGui(v2u32 screensize) void GUIPasswordChange::regenerateGui(v2u32 screensize)
{ {
/*
save current input
*/
acceptInput();
/* /*
Remove stuff Remove stuff
*/ */
@ -119,7 +111,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos); rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e = Environment->addEditBox( gui::IGUIEditBox *e = Environment->addEditBox(
L"", rect, true, this, ID_oldPassword); m_oldpass.c_str(), rect, true, this, ID_oldPassword);
Environment->setFocus(e); Environment->setFocus(e);
e->setPasswordBox(true); e->setPasswordBox(true);
} }
@ -135,7 +127,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos); rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e = Environment->addEditBox( gui::IGUIEditBox *e = Environment->addEditBox(
L"", rect, true, this, ID_newPassword1); m_newpass.c_str(), rect, true, this, ID_newPassword1);
e->setPasswordBox(true); e->setPasswordBox(true);
} }
ypos += 50; ypos += 50;
@ -150,7 +142,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos); rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e = Environment->addEditBox( gui::IGUIEditBox *e = Environment->addEditBox(
L"", rect, true, this, ID_newPassword2); m_newpass_confirm.c_str(), rect, true, this, ID_newPassword2);
e->setPasswordBox(true); e->setPasswordBox(true);
} }
@ -196,25 +188,29 @@ void GUIPasswordChange::drawMenu()
gui::IGUIElement::draw(); gui::IGUIElement::draw();
} }
bool GUIPasswordChange::acceptInput() void GUIPasswordChange::acceptInput()
{ {
std::wstring oldpass;
std::wstring newpass;
gui::IGUIElement *e; gui::IGUIElement *e;
e = getElementFromId(ID_oldPassword); e = getElementFromId(ID_oldPassword);
if (e != NULL) if (e != NULL)
oldpass = e->getText(); m_oldpass = e->getText();
e = getElementFromId(ID_newPassword1); e = getElementFromId(ID_newPassword1);
if (e != NULL) if (e != NULL)
newpass = e->getText(); m_newpass = e->getText();
e = getElementFromId(ID_newPassword2); e = getElementFromId(ID_newPassword2);
if (e != NULL && newpass != e->getText()) { if (e != NULL)
e = getElementFromId(ID_message); m_newpass_confirm = e->getText();
}
bool GUIPasswordChange::processInput()
{
if (m_newpass != m_newpass_confirm) {
gui::IGUIElement *e = getElementFromId(ID_message);
if (e != NULL) if (e != NULL)
e->setVisible(true); e->setVisible(true);
return false; return false;
} }
m_client->sendChangePassword(wide_to_utf8(oldpass), wide_to_utf8(newpass)); m_client->sendChangePassword(wide_to_utf8(m_oldpass), wide_to_utf8(m_newpass));
return true; return true;
} }
@ -226,7 +222,8 @@ bool GUIPasswordChange::OnEvent(const SEvent &event)
return true; return true;
} }
if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) { if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
if (acceptInput()) acceptInput();
if (processInput())
quitMenu(); quitMenu();
return true; return true;
} }
@ -244,7 +241,8 @@ bool GUIPasswordChange::OnEvent(const SEvent &event)
if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) { if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
switch (event.GUIEvent.Caller->getID()) { switch (event.GUIEvent.Caller->getID()) {
case ID_change: case ID_change:
if (acceptInput()) acceptInput();
if (processInput())
quitMenu(); quitMenu();
return true; return true;
case ID_cancel: case ID_cancel:
@ -257,7 +255,8 @@ bool GUIPasswordChange::OnEvent(const SEvent &event)
case ID_oldPassword: case ID_oldPassword:
case ID_newPassword1: case ID_newPassword1:
case ID_newPassword2: case ID_newPassword2:
if (acceptInput()) acceptInput();
if (processInput())
quitMenu(); quitMenu();
return true; return true;
} }

7
src/guiPasswordChange.h
View File

@ -39,12 +39,17 @@ public:
void drawMenu(); void drawMenu();
bool acceptInput(); void acceptInput();
bool processInput();
bool OnEvent(const SEvent &event); bool OnEvent(const SEvent &event);
private: private:
Client *m_client; Client *m_client;
std::wstring m_oldpass;
std::wstring m_newpass;
std::wstring m_newpass_confirm;
}; };
#endif #endif