diff options
Diffstat (limited to 'src/gui/guiPasswordChange.cpp')
| -rw-r--r-- | src/gui/guiPasswordChange.cpp | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/src/gui/guiPasswordChange.cpp b/src/gui/guiPasswordChange.cpp index 5311c6fef..5eb777173 100644 --- a/src/gui/guiPasswordChange.cpp +++ b/src/gui/guiPasswordChange.cpp @@ -35,15 +35,11 @@ const int ID_change = 259; const int ID_message = 260; const int ID_cancel = 261; -GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment* env, - gui::IGUIElement* parent, s32 id, - IMenuManager *menumgr, - Client* client, - ISimpleTextureSource *tsrc -): - GUIModalMenu(env, parent, id, menumgr), - m_client(client), - m_tsrc(tsrc) +GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment *env, gui::IGUIElement *parent, + s32 id, IMenuManager *menumgr, Client *client, + ISimpleTextureSource *tsrc) : + GUIModalMenu(env, parent, id, menumgr), + m_client(client), m_tsrc(tsrc) { } @@ -80,12 +76,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) Calculate new sizes and positions */ const float s = m_gui_scale; - DesiredRect = core::rect<s32>( - screensize.X / 2 - 580 * s / 2, - screensize.Y / 2 - 300 * s / 2, - screensize.X / 2 + 580 * s / 2, - screensize.Y / 2 + 300 * s / 2 - ); + DesiredRect = core::rect<s32>(screensize.X / 2 - 580 * s / 2, + screensize.Y / 2 - 300 * s / 2, screensize.X / 2 + 580 * s / 2, + screensize.Y / 2 + 300 * s / 2); recalculateAbsolutePosition(false); v2s32 size = DesiredRect.getSize(); @@ -138,8 +131,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 230 * s, 30 * s); rect += topleft_client + v2s32(160 * s, ypos); - gui::IGUIEditBox *e = Environment->addEditBox( - m_newpass_confirm.c_str(), rect, true, this, ID_newPassword2); + gui::IGUIEditBox *e = Environment->addEditBox(m_newpass_confirm.c_str(), + rect, true, this, ID_newPassword2); e->setPasswordBox(true); } @@ -164,9 +157,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) core::rect<s32> rect(0, 0, 300 * s, 20 * s); rect += topleft_client + v2s32(35 * s, ypos); text = wgettext("Passwords do not match!"); - IGUIElement *e = - Environment->addStaticText( - text, rect, false, true, this, ID_message); + IGUIElement *e = Environment->addStaticText( + text, rect, false, true, this, ID_message); e->setVisible(false); delete[] text; } @@ -236,8 +228,9 @@ bool GUIPasswordChange::OnEvent(const SEvent &event) if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST && isVisible()) { if (!canTakeFocus(event.GUIEvent.Element)) { - infostream << "GUIPasswordChange: Not allowing focus change." - << std::endl; + infostream << "GUIPasswordChange: Not allowing focus " + "change." + << std::endl; // Returning true disables focus change return true; } |