BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix cursor still visible after closing formspec while on HyperText (#9583)

Browse Source
This commit is contained in:
Pierre-Yves Rollo 2020-04-04 16:17:15 +02:00 committed by GitHub
parent 307d7376cf
commit 86a0e991ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/guiHyperText.cpp
View File

@ -1054,12 +1054,14 @@ void GUIHyperText::checkHover(s32 X, s32 Y)
} }
} }
#ifndef HAVE_TOUCHSCREENGUI
if (m_drawer.m_hovertag) if (m_drawer.m_hovertag)
RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon( RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon(
gui::ECI_HAND); gui::ECI_HAND);
else else
RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon( RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon(
gui::ECI_NORMAL); gui::ECI_NORMAL);
#endif
} }
bool GUIHyperText::OnEvent(const SEvent &event) bool GUIHyperText::OnEvent(const SEvent &event)
@ -1075,8 +1077,12 @@ bool GUIHyperText::OnEvent(const SEvent &event)
if (event.EventType == EET_GUI_EVENT && if (event.EventType == EET_GUI_EVENT &&
event.GUIEvent.EventType == EGET_ELEMENT_LEFT) { event.GUIEvent.EventType == EGET_ELEMENT_LEFT) {
m_drawer.m_hovertag = nullptr; m_drawer.m_hovertag = nullptr;
RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon( #ifndef HAVE_TOUCHSCREENGUI
gui::ECI_NORMAL); gui::ICursorControl *cursor_control =
RenderingEngine::get_raw_device()->getCursorControl();
if (cursor_control->isVisible())
cursor_control->setActiveIcon(gui::ECI_NORMAL);
#endif
} }
if (event.EventType == EET_MOUSE_INPUT_EVENT) { if (event.EventType == EET_MOUSE_INPUT_EVENT) {