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

Use our GUIButton in touchscreengui

Browse Source
This commit is contained in:
Desour 2023-08-09 01:26:42 +02:00 committed by sfan5
parent 91c0439922
commit f7f3aaf43c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/touchscreengui.cpp
View File

@ -29,6 +29,7 @@ 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>
@ -153,8 +154,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 = m_guienv->addButton(starter_rect, nullptr, IGUIButton *starter_gui_button = GUIButton::addButton(m_guienv, starter_rect,
button_id, L"", nullptr); m_texturesource, 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();
@ -238,8 +239,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 = m_guienv->addButton(current_button, nullptr, button_id, IGUIButton *btn_gui_button = GUIButton::addButton(m_guienv, current_button,
caption, nullptr); m_texturesource, nullptr, button_id, 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;
@ -413,7 +414,8 @@ 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 = m_guienv->addButton(button_rect, nullptr, id, caption.c_str()); IGUIButton *btn_gui_button = GUIButton::addButton(m_guienv, button_rect,
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;