diff options
| author | SmallJoker <mk939@ymail.com> | 2020-12-13 18:25:13 +0100 |
|---|---|---|
| committer | lhofhansl <larsh@apache.org> | 2020-12-14 11:05:24 -0800 |
| commit | f2c8c6bf51e608ad6f71710032b8ae017b84fd3d (patch) | |
| tree | 428d31e463cddbaf7db5f2866631f7fe7ef47f92 | |
| parent | e18b6c5a21880125284d2a1e9dfb5471d5bc2bec (diff) | |
| download | minetest-f2c8c6bf51e608ad6f71710032b8ae017b84fd3d.tar.gz minetest-f2c8c6bf51e608ad6f71710032b8ae017b84fd3d.tar.bz2 minetest-f2c8c6bf51e608ad6f71710032b8ae017b84fd3d.zip | |
Revert "GUIFormSpecMenu: Shift+Click listring workaround for MacOS"
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/
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index 74578111e..632b15992 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -4075,9 +4075,6 @@ enum ButtonEventType : u8 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) { KeyPress kp(event.KeyInput); if (event.KeyInput.PressedDown && ( @@ -4087,8 +4084,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event) return true; } - is_shift_down = event.KeyInput.Shift; - if (m_client != NULL && event.KeyInput.PressedDown && (kp == getKeySetting("keymap_screenshot"))) { m_client->makeScreenshot(); @@ -4138,9 +4133,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event) event.MouseInput.isRightPressed() && 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) m_old_tooltip_id = -1; @@ -4271,7 +4263,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event) else // left count = s_count; - if (!is_shift_down) { + if (!event.MouseInput.Shift) { // no shift: select item m_selected_amount = count; m_selected_dragging = button != BET_WHEEL_DOWN; |