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

Revert "GUIFormSpecMenu: Shift+Click listring workaround for MacOS"

Browse Source 
The commit caused Shift-Clicking issues on Linux due to another Irrlicht bug where
KeyInput.Shift released keys do not trigger OnEvent()

MacOS users should build using a recent Irrlicht 1.8 development version.
See also: https://sourceforge.net/p/irrlicht/patches/321/
This commit is contained in:
SmallJoker 2020-12-13 18:25:13 +01:00 committed by lhofhansl
parent e18b6c5a21
commit f2c8c6bf51
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/guiFormSpecMenu.cpp
View File

@ -4075,9 +4075,6 @@ enum ButtonEventType : u8
bool GUIFormSpecMenu::OnEvent(const SEvent& event) bool GUIFormSpecMenu::OnEvent(const SEvent& event)
{ {
// WORKAROUND: event.MouseInput.Shift is not implemented for MacOS
static thread_local bool is_shift_down = false;
if (event.EventType==EET_KEY_INPUT_EVENT) { if (event.EventType==EET_KEY_INPUT_EVENT) {
KeyPress kp(event.KeyInput); KeyPress kp(event.KeyInput);
if (event.KeyInput.PressedDown && ( if (event.KeyInput.PressedDown && (
@ -4087,8 +4084,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
return true; return true;
} }
is_shift_down = event.KeyInput.Shift;
if (m_client != NULL && event.KeyInput.PressedDown && if (m_client != NULL && event.KeyInput.PressedDown &&
(kp == getKeySetting("keymap_screenshot"))) { (kp == getKeySetting("keymap_screenshot"))) {
m_client->makeScreenshot(); m_client->makeScreenshot();
@ -4138,9 +4133,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
event.MouseInput.isRightPressed() && event.MouseInput.isRightPressed() &&
getItemAtPos(m_pointer).i != getItemAtPos(m_old_pointer).i))) { getItemAtPos(m_pointer).i != getItemAtPos(m_old_pointer).i))) {
// WORKAROUND: In case shift was pressed prior showing the formspec
is_shift_down |= event.MouseInput.Shift;
// Get selected item and hovered/clicked item (s) // Get selected item and hovered/clicked item (s)
m_old_tooltip_id = -1; m_old_tooltip_id = -1;
@ -4271,7 +4263,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
else // left else // left
count = s_count; count = s_count;
if (!is_shift_down) { if (!event.MouseInput.Shift) {
// no shift: select item // no shift: select item
m_selected_amount = count; m_selected_amount = count;
m_selected_dragging = button != BET_WHEEL_DOWN; m_selected_dragging = button != BET_WHEEL_DOWN;