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

Use IGUIImage instead of IGUIButton 

TouchScreenGUI doesn't use any Irrlicht button functionality, it implements button interaction itself. IGUIButtons were used as static images.
This commit is contained in:
Gregor Parzefall 2024-04-13 18:02:14 +02:00
parent 16e3161d30
commit 0785012e4a
2 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/touchscreengui.cpp
View File

@ -65,26 +65,14 @@ const std::string button_image_names[] = {
"joystick_center.png",
};
static void load_button_texture(IGUIButton *gui_button, const std::string &path,
static void load_button_texture(IGUIImage *gui_button, const std::string &path,
const recti &button_rect, ISimpleTextureSource *tsrc, video::IVideoDriver *driver)
{
video::ITexture *texture = guiScalingImageButton(driver,
tsrc->getTexture(path), button_rect.getWidth(),
button_rect.getHeight());
if (texture) {
gui_button->setUseAlphaChannel(true);
if (g_settings->getBool("gui_scaling_filter")) {
recti txr_rect(0, 0, button_rect.getWidth(), button_rect.getHeight());
gui_button->setImage(texture, txr_rect);
gui_button->setPressedImage(texture, txr_rect);
gui_button->setScaleImage(false);
} else {
gui_button->setImage(texture);
gui_button->setPressedImage(texture);
gui_button->setScaleImage(true);
}
gui_button->setDrawBorder(false);
}
gui_button->setImage(texture);
gui_button->setScaleImage(true);
}
void button_info::emitAction(bool action, video::IVideoDriver *driver,
@ -266,12 +254,12 @@ AutoHideButtonBar::AutoHideButtonBar(IrrlichtDevice *device, ISimpleTextureSourc
m_upper_left = starter_rect.UpperLeftCorner;
m_lower_right = starter_rect.LowerRightCorner;
IGUIButton *starter_gui_button = m_guienv->addButton(starter_rect, nullptr,
IGUIImage *starter_gui_button = m_guienv->addImage(starter_rect, nullptr,
starter_id);
load_button_texture(starter_gui_button, starter_img, starter_rect,
m_texturesource, m_driver);
m_starter = grab_gui_element<IGUIButton>(starter_gui_button);
m_starter = grab_gui_element<IGUIImage>(starter_gui_button);
m_dir = dir;
}
@ -318,14 +306,14 @@ void AutoHideButtonBar::addButton(touch_gui_button_id id, const std::string &ima
current_button = recti(m_upper_left.X, y_start, m_lower_right.Y, y_end);
}
IGUIButton *btn_gui_button = m_guienv->addButton(current_button, nullptr, id);
IGUIImage *btn_gui_button = m_guienv->addImage(current_button, nullptr, id);
btn_gui_button->setVisible(false);
btn_gui_button->setEnabled(false);
load_button_texture(btn_gui_button, image, current_button, m_texturesource, m_driver);
button_info btn{};
btn.keycode = id_to_keycode(id);
btn.gui_button = grab_gui_element<IGUIButton>(btn_gui_button);
btn.gui_button = grab_gui_element<IGUIImage>(btn_gui_button);
m_buttons.push_back(btn);
}
@ -437,26 +425,26 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, ISimpleTextureSource *tsr
// Initialize joystick display "button".
// Joystick is placed on the bottom left of screen.
if (m_fixed_joystick) {
m_joystick_btn_off = grab_gui_element<IGUIButton>(makeJoystickButton(joystick_off_id,
m_joystick_btn_off = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_off_id,
recti(m_button_size,
m_screensize.Y - m_button_size * 4,
m_button_size * 4,
m_screensize.Y - m_button_size), true));
} else {
m_joystick_btn_off = grab_gui_element<IGUIButton>(makeJoystickButton(joystick_off_id,
m_joystick_btn_off = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_off_id,
recti(m_button_size,
m_screensize.Y - m_button_size * 3,
m_button_size * 3,
m_screensize.Y - m_button_size), true));
}
m_joystick_btn_bg = grab_gui_element<IGUIButton>(makeJoystickButton(joystick_bg_id,
m_joystick_btn_bg = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_bg_id,
recti(m_button_size,
m_screensize.Y - m_button_size * 4,
m_button_size * 4,
m_screensize.Y - m_button_size), false));
m_joystick_btn_center = grab_gui_element<IGUIButton>(makeJoystickButton(joystick_center_id,
m_joystick_btn_center = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_center_id,
recti(0, 0, m_button_size, m_button_size), false));
// init jump button
@ -533,19 +521,19 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, ISimpleTextureSource *tsr
void TouchScreenGUI::addButton(touch_gui_button_id id, const std::string &image, const recti &rect)
{
IGUIButton *btn_gui_button = m_guienv->addButton(rect, nullptr, id);
IGUIImage *btn_gui_button = m_guienv->addImage(rect, nullptr, id);
load_button_texture(btn_gui_button, image, rect,
m_texturesource, m_device->getVideoDriver());
button_info &btn = m_buttons.emplace_back();
btn.keycode = id_to_keycode(id);
btn.gui_button = grab_gui_element<IGUIButton>(btn_gui_button);
btn.gui_button = grab_gui_element<IGUIImage>(btn_gui_button);
}
IGUIButton *TouchScreenGUI::makeJoystickButton(touch_gui_button_id id,
IGUIImage *TouchScreenGUI::makeJoystickButton(touch_gui_button_id id,
const recti &button_rect, bool visible)
{
IGUIButton *btn_gui_button = m_guienv->addButton(button_rect, nullptr, id);
IGUIImage *btn_gui_button = m_guienv->addImage(button_rect, nullptr, id);
btn_gui_button->setVisible(visible);
load_button_texture(btn_gui_button, button_image_names[id], button_rect,
m_texturesource, m_device->getVideoDriver());

14
src/gui/touchscreengui.h
View File

@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes.h"
#include <IEventReceiver.h>
#include <IGUIButton.h>
#include <IGUIImage.h>
#include <IGUIEnvironment.h>
#include <IrrlichtDevice.h>
@ -123,7 +123,7 @@ struct button_info
float repeat_counter;
EKEY_CODE keycode;
std::vector<size_t> pointer_ids;
std::shared_ptr<IGUIButton> gui_button = nullptr;
std::shared_ptr<IGUIImage> gui_button = nullptr;
enum {
NOT_TOGGLEABLE,
@ -166,7 +166,7 @@ private:
IGUIEnvironment *m_guienv = nullptr;
IEventReceiver *m_receiver = nullptr;
ISimpleTextureSource *m_texturesource = nullptr;
std::shared_ptr<IGUIButton> m_starter;
std::shared_ptr<IGUIImage> m_starter;
std::vector<button_info> m_buttons;
v2s32 m_upper_left;
@ -266,9 +266,9 @@ private:
bool m_fixed_joystick = false;
bool m_joystick_triggers_aux1 = false;
bool m_draw_crosshair = false;
std::shared_ptr<IGUIButton> m_joystick_btn_off;
std::shared_ptr<IGUIButton> m_joystick_btn_bg;
std::shared_ptr<IGUIButton> m_joystick_btn_center;
std::shared_ptr<IGUIImage> m_joystick_btn_off;
std::shared_ptr<IGUIImage> m_joystick_btn_bg;
std::shared_ptr<IGUIImage> m_joystick_btn_center;
std::vector<button_info> m_buttons;
@ -277,7 +277,7 @@ private:
const recti &rect);
// initialize a joystick button
IGUIButton *makeJoystickButton(touch_gui_button_id id,
IGUIImage *makeJoystickButton(touch_gui_button_id id,
const recti &rect, bool visible);
// handle pressing hotbar items