oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

TouchScreenGUI: Fix only 9 hotbar slots being usable (#13698)

Browse source 
Co-authored-by: Muhammad Rifqi Priyo Susanto <muhammadrifqipriyosusanto@gmail.com>
This commit is contained in:
Gregor Parzefall 2023-08-24 17:45:51 +02:00 • committed by GitHub
parent 72ef90885d
commit 92b6ff4721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 63 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/gui/touchscreengui.cpp
View file

@ -583,25 +583,28 @@ touch_gui_button_id TouchScreenGUI::getButtonID(size_t eventID)
return after_last_element_id;
}
bool TouchScreenGUI::isHUDButton(const SEvent &event)
bool TouchScreenGUI::isHotbarButton(const SEvent &event)
{
// check if hud item is pressed
for (auto &hud_rect : m_hud_rects) {
if (hud_rect.second.isPointInside(v2s32(event.TouchInput.X, event.TouchInput.Y))) {
SEvent translated{};
translated.EventType = irr::EET_KEY_INPUT_EVENT;
translated.KeyInput.Key = (irr::EKEY_CODE) (KEY_KEY_1 + hud_rect.first);
translated.KeyInput.Control = false;
translated.KeyInput.Shift = false;
translated.KeyInput.PressedDown = true;
m_receiver->OnEvent(translated);
m_hud_ids[event.TouchInput.ID] = translated.KeyInput.Key;
const v2s32 touch_pos = v2s32(event.TouchInput.X, event.TouchInput.Y);
// check if hotbar item is pressed
for (auto &[index, rect] : m_hotbar_rects) {
if (rect.isPointInside(touch_pos)) {
// We can't just emit a keypress event because the number keys
// range from 1 to 9, but there may be more hotbar items.
m_hotbar_selection = index;
return true;
}
}
return false;
}
std::optional<u16> TouchScreenGUI::getHotbarSelection()
{
auto selection = m_hotbar_selection;
m_hotbar_selection = std::nullopt;
return selection;
}
void TouchScreenGUI::handleButtonEvent(touch_gui_button_id button,
size_t eventID, bool action)
{
@ -745,10 +748,10 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
handleButtonEvent(button, eventID, true);
m_settings_bar.deactivate();
m_rare_controls_bar.deactivate();
} else if (isHUDButton(event)) {
} else if (isHotbarButton(event)) {
m_settings_bar.deactivate();
m_rare_controls_bar.deactivate();
// already handled in isHUDButton()
// already handled in isHotbarButton()
} else if (m_settings_bar.isButton(event)) {
m_rare_controls_bar.deactivate();
// already handled in isSettingsBarButton()
@ -1071,14 +1074,14 @@ void TouchScreenGUI::step(float dtime)
m_rare_controls_bar.step(dtime);
}
void TouchScreenGUI::resetHud()
void TouchScreenGUI::resetHotbarRects()
{
m_hud_rects.clear();
m_hotbar_rects.clear();
}
void TouchScreenGUI::registerHudItem(int index, const rect<s32> &rect)
void TouchScreenGUI::registerHotbarRect(u16 index, const rect<s32> &rect)
{
m_hud_rects[index] = rect;
m_hotbar_rects[index] = rect;
}
void TouchScreenGUI::setVisible(bool visible)