minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TouchScreen Control: fix some bugs, cleanup

This commit is contained in:
MoNTE48 2020-04-16 18:49:07 +02:00 committed by SmallJoker
parent 756dc89ede
commit 0d8e5bf587
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/gui/modalMenu.cpp
View File

@ -28,8 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "touchscreengui.h" #include "touchscreengui.h"
#endif #endif
// clang-format off GUIModalMenu::GUIModalMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
GUIModalMenu::GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id,
IMenuManager *menumgr) : IMenuManager *menumgr) :
IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
core::rect<s32>(0, 0, 100, 100)), core::rect<s32>(0, 0, 100, 100)),
@ -153,8 +152,8 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
if (((gui::IGUIEditBox *)hovered)->isPasswordBox()) if (((gui::IGUIEditBox *)hovered)->isPasswordBox())
type = 3; type = 3;
porting::showInputDialog(gettext("ok"), "", porting::showInputDialog(gettext("OK"), "",
wide_to_utf8(((gui::IGUIEditBox *)hovered)->getText()), type); wide_to_utf8(((gui::IGUIEditBox *)hovered)->getText()), type);
return retval; return retval;
} }
} }
@ -167,18 +166,17 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
if (!root) { if (!root) {
errorstream << "GUIModalMenu::preprocessEvent" errorstream << "GUIModalMenu::preprocessEvent"
<< " unable to get root element" << std::endl; << " unable to get root element" << std::endl;
return false; return false;
} }
gui::IGUIElement *hovered = root->getElementFromPoint( gui::IGUIElement *hovered =
core::position2d<s32>(event.TouchInput.X, event.TouchInput.Y)); root->getElementFromPoint(core::position2d<s32>(
event.TouchInput.X, event.TouchInput.Y));
translated.MouseInput.X = event.TouchInput.X; translated.MouseInput.X = event.TouchInput.X;
translated.MouseInput.Y = event.TouchInput.Y; translated.MouseInput.Y = event.TouchInput.Y;
translated.MouseInput.Control = false; translated.MouseInput.Control = false;
bool dont_send_event = false;
if (event.TouchInput.touchedCount == 1) { if (event.TouchInput.touchedCount == 1) {
switch (event.TouchInput.Event) { switch (event.TouchInput.Event) {
case ETIE_PRESSED_DOWN: case ETIE_PRESSED_DOWN:
@ -205,11 +203,7 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
m_down_pos = v2s32(0, 0); m_down_pos = v2s32(0, 0);
break; break;
default: default:
dont_send_event = true; break;
// this is not supposed to happen
errorstream << "GUIModalMenu::preprocessEvent"
<< " unexpected usecase Event="
<< event.TouchInput.Event << std::endl;
} }
} else if ((event.TouchInput.touchedCount == 2) && } else if ((event.TouchInput.touchedCount == 2) &&
(event.TouchInput.Event == ETIE_PRESSED_DOWN)) { (event.TouchInput.Event == ETIE_PRESSED_DOWN)) {
@ -219,50 +213,37 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
translated.MouseInput.ButtonStates = EMBSM_LEFT | EMBSM_RIGHT; translated.MouseInput.ButtonStates = EMBSM_LEFT | EMBSM_RIGHT;
translated.MouseInput.X = m_pointer.X; translated.MouseInput.X = m_pointer.X;
translated.MouseInput.Y = m_pointer.Y; translated.MouseInput.Y = m_pointer.Y;
if (hovered) { if (hovered)
hovered->OnEvent(translated); hovered->OnEvent(translated);
}
translated.MouseInput.Event = EMIE_RMOUSE_LEFT_UP; translated.MouseInput.Event = EMIE_RMOUSE_LEFT_UP;
translated.MouseInput.ButtonStates = EMBSM_LEFT; translated.MouseInput.ButtonStates = EMBSM_LEFT;
if (hovered) { if (hovered)
hovered->OnEvent(translated); hovered->OnEvent(translated);
}
dont_send_event = true;
}
// ignore unhandled 2 touch events ... accidental moving for example
else if (event.TouchInput.touchedCount == 2) {
dont_send_event = true;
}
else if (event.TouchInput.touchedCount > 2) {
errorstream << "GUIModalMenu::preprocessEvent"
<< " to many multitouch events "
<< event.TouchInput.touchedCount << " ignoring them"
<< std::endl;
}
if (dont_send_event) { return true;
} else {
// ignore unhandled 2 touch events (accidental moving for example)
return true; return true;
} }
// check if translated event needs to be preprocessed again // check if translated event needs to be preprocessed again
if (preprocessEvent(translated)) { if (preprocessEvent(translated))
return true; return true;
}
if (hovered) { if (hovered) {
grab(); grab();
bool retval = hovered->OnEvent(translated); bool retval = hovered->OnEvent(translated);
if (event.TouchInput.Event == ETIE_LEFT_UP) { if (event.TouchInput.Event == ETIE_LEFT_UP)
// reset pointer // reset pointer
m_pointer = v2s32(0, 0); m_pointer = v2s32(0, 0);
}
drop(); drop();
return retval; return retval;
} }
} }
// clang-format on
#endif #endif
return false; return false;
} }
@ -271,14 +252,12 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
bool GUIModalMenu::hasAndroidUIInput() bool GUIModalMenu::hasAndroidUIInput()
{ {
// no dialog shown // no dialog shown
if (m_jni_field_name.empty()) { if (m_jni_field_name.empty())
return false; return false;
}
// still waiting // still waiting
if (porting::getInputDialogState() == -1) { if (porting::getInputDialogState() == -1)
return true; return true;
}
// no value abort dialog processing // no value abort dialog processing
if (porting::getInputDialogState() != 0) { if (porting::getInputDialogState() != 0) {