aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSmallJoker <mk939@ymail.com>2019-12-09 20:01:16 +0100
committerSmallJoker <mk939@ymail.com>2019-12-09 20:01:16 +0100
commita462181e5fe631b816cb67a4e2cb8a870ed71840 (patch)
tree03e6c7f64df2a80a5ac8e0aea1feea45e78479cd
parent8f73ec6c6c18ea5676261064399a650911333da5 (diff)
downloadminetest-a462181e5fe631b816cb67a4e2cb8a870ed71840.tar.gz
minetest-a462181e5fe631b816cb67a4e2cb8a870ed71840.tar.bz2
minetest-a462181e5fe631b816cb67a4e2cb8a870ed71840.zip
guiConfirmRegistration: Fix hidden error message
-rw-r--r--src/gui/guiConfirmRegistration.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp
index 49b81b01d..0d8bdf54e 100644
--- a/src/gui/guiConfirmRegistration.cpp
+++ b/src/gui/guiConfirmRegistration.cpp
@@ -33,8 +33,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// Continuing from guiPasswordChange.cpp
const int ID_confirmPassword = 262;
const int ID_confirm = 263;
-const int ID_message = 264;
+const int ID_intotext = 264;
const int ID_cancel = 265;
+const int ID_message = 266;
GUIConfirmRegistration::GUIConfirmRegistration(gui::IGUIEnvironment *env,
gui::IGUIElement *parent, s32 id, IMenuManager *menumgr, Client *client,
@@ -106,7 +107,7 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf);
gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true,
- Environment, this, ID_message, rect2, false, true);
+ Environment, this, ID_intotext, rect2, false, true);
delete[] info_text_buf_wide;
e->drop();
e->setMultiLine(true);
@@ -114,7 +115,7 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_CENTER);
}
- ypos += 210 * s;
+ ypos += 200 * s;
{
core::rect<s32> rect2(0, 0, 540 * s, 30 * s);
rect2 += topleft_client + v2s32(30 * s, ypos);
@@ -124,7 +125,7 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
Environment->setFocus(e);
}
- ypos += 60 * s;
+ ypos += 50 * s;
{
core::rect<s32> rect2(0, 0, 230 * s, 35 * s);
rect2 = rect2 + v2s32(size.X / 2 - 220 * s, ypos);
@@ -140,8 +141,8 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
delete[] text;
}
{
- core::rect<s32> rect2(0, 0, 200 * s, 20 * s);
- rect2 += topleft_client + v2s32(30 * s, ypos - 40 * s);
+ core::rect<s32> rect2(0, 0, 500 * s, 40 * s);
+ rect2 += topleft_client + v2s32(30 * s, ypos + 40 * s);
text = wgettext("Passwords do not match!");
IGUIElement *e = Environment->addStaticText(
text, rect2, false, true, this, ID_message);