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

Android: Fix ConfirmRegistration and PasswordChange input and scale size (#10182)

Browse Source
This commit is contained in:
Maksim 2020-07-21 14:16:25 +02:00 committed by GitHub
parent 82731d0d3d
commit 76afde861d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/guiConfirmRegistration.cpp
View File

@ -73,7 +73,11 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
/* /*
Calculate new sizes and positions Calculate new sizes and positions
*/ */
#ifdef __ANDROID__
const float s = m_gui_scale * porting::getDisplayDensity() / 2;
#else
const float s = m_gui_scale; const float s = m_gui_scale;
#endif
DesiredRect = core::rect<s32>( DesiredRect = core::rect<s32>(
screensize.X / 2 - 600 * s / 2, screensize.X / 2 - 600 * s / 2,
screensize.Y / 2 - 360 * s / 2, screensize.Y / 2 - 360 * s / 2,
@ -257,12 +261,19 @@ bool GUIConfirmRegistration::getAndroidUIInput()
if (!hasAndroidUIInput() || m_jni_field_name != "password") if (!hasAndroidUIInput() || m_jni_field_name != "password")
return false; return false;
std::string text = porting::getInputDialogValue(); // still waiting
gui::IGUIElement *e = getElementFromId(ID_confirmPassword); if (porting::getInputDialogState() == -1)
if (e) return true;
e->setText(utf8_to_wide(text).c_str());
m_jni_field_name.clear(); m_jni_field_name.clear();
gui::IGUIElement *e = getElementFromId(ID_confirmPassword);
if (!e || e->getType() != irr::gui::EGUIET_EDIT_BOX)
return false;
std::string text = porting::getInputDialogValue();
e->setText(utf8_to_wide(text).c_str());
return false; return false;
} }
#endif #endif

19
src/gui/guiPasswordChange.cpp
View File

@ -79,7 +79,11 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
/* /*
Calculate new sizes and positions Calculate new sizes and positions
*/ */
#ifdef __ANDROID__
const float s = m_gui_scale * porting::getDisplayDensity() / 2;
#else
const float s = m_gui_scale; const float s = m_gui_scale;
#endif
DesiredRect = core::rect<s32>( DesiredRect = core::rect<s32>(
screensize.X / 2 - 580 * s / 2, screensize.X / 2 - 580 * s / 2,
screensize.Y / 2 - 300 * s / 2, screensize.Y / 2 - 300 * s / 2,
@ -289,6 +293,10 @@ bool GUIPasswordChange::getAndroidUIInput()
if (!hasAndroidUIInput()) if (!hasAndroidUIInput())
return false; return false;
// still waiting
if (porting::getInputDialogState() == -1)
return true;
gui::IGUIElement *e = nullptr; gui::IGUIElement *e = nullptr;
if (m_jni_field_name == "old_password") if (m_jni_field_name == "old_password")
e = getElementFromId(ID_oldPassword); e = getElementFromId(ID_oldPassword);
@ -296,12 +304,13 @@ bool GUIPasswordChange::getAndroidUIInput()
e = getElementFromId(ID_newPassword1); e = getElementFromId(ID_newPassword1);
else if (m_jni_field_name == "new_password_2") else if (m_jni_field_name == "new_password_2")
e = getElementFromId(ID_newPassword2); e = getElementFromId(ID_newPassword2);
if (e) {
std::string text = porting::getInputDialogValue();
e->setText(utf8_to_wide(text).c_str());
}
m_jni_field_name.clear(); m_jni_field_name.clear();
if (!e || e->getType() != irr::gui::EGUIET_EDIT_BOX)
return false;
std::string text = porting::getInputDialogValue();
e->setText(utf8_to_wide(text).c_str());
return false; return false;
} }
#endif #endif