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

Revert "Use our GUIButton in touchscreengui"

Browse Source 
This reverts commit f7f3aaf43c88179bafd255f3c67275f316cff91a.
Fixes #13743.
This commit is contained in:
Desour 2023-08-21 15:07:52 +02:00 committed by DS
parent aea9242a96
commit f98726c516
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/touchscreengui.cpp
View File

@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client/keycode.h" #include "client/keycode.h"
#include "client/renderingengine.h" #include "client/renderingengine.h"
#include "util/numeric.h" #include "util/numeric.h"
#include "guiButton.h"
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
@ -154,8 +153,8 @@ void AutoHideButtonBar::init(ISimpleTextureSource *tsrc,
rect<int> starter_rect = rect<s32>(UpperLeft.X, UpperLeft.Y, LowerRight.X, LowerRight.Y); rect<int> starter_rect = rect<s32>(UpperLeft.X, UpperLeft.Y, LowerRight.X, LowerRight.Y);
IGUIButton *starter_gui_button = GUIButton::addButton(m_guienv, starter_rect, IGUIButton *starter_gui_button = m_guienv->addButton(starter_rect, nullptr,
m_texturesource, nullptr, button_id, L"", nullptr); button_id, L"", nullptr);
m_starter.gui_button = starter_gui_button; m_starter.gui_button = starter_gui_button;
m_starter.gui_button->grab(); m_starter.gui_button->grab();
@ -239,8 +238,8 @@ void AutoHideButtonBar::addButton(touch_gui_button_id button_id, const wchar_t *
current_button = rect<s32>(m_upper_left.X, y_start, m_lower_right.Y, y_end); current_button = rect<s32>(m_upper_left.X, y_start, m_lower_right.Y, y_end);
} }
IGUIButton *btn_gui_button = GUIButton::addButton(m_guienv, current_button, IGUIButton *btn_gui_button = m_guienv->addButton(current_button, nullptr, button_id,
m_texturesource, nullptr, button_id, caption, nullptr); caption, nullptr);
std::shared_ptr<button_info> btn(new button_info); std::shared_ptr<button_info> btn(new button_info);
btn->gui_button = btn_gui_button; btn->gui_button = btn_gui_button;
@ -414,8 +413,7 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver)
void TouchScreenGUI::initButton(touch_gui_button_id id, const rect<s32> &button_rect, void TouchScreenGUI::initButton(touch_gui_button_id id, const rect<s32> &button_rect,
const std::wstring &caption, bool immediate_release, float repeat_delay) const std::wstring &caption, bool immediate_release, float repeat_delay)
{ {
IGUIButton *btn_gui_button = GUIButton::addButton(m_guienv, button_rect, IGUIButton *btn_gui_button = m_guienv->addButton(button_rect, nullptr, id, caption.c_str());
m_texturesource, nullptr, id, caption.c_str());
button_info *btn = &m_buttons[id]; button_info *btn = &m_buttons[id];
btn->gui_button = btn_gui_button; btn->gui_button = btn_gui_button;