Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix inventory drag drop flag (#6416)

Browse Source
This commit is contained in:
asl97 2017-10-18 03:50:58 +08:00 committed by Loïc Blot
parent 5e24ca05fd
commit 38b0e26679
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/guiFormSpecMenu.cpp
View File

@ -3449,7 +3449,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
// no shift: select item // no shift: select item
m_selected_amount = count; m_selected_amount = count;
m_selected_dragging = true; m_selected_dragging = true;
m_rmouse_auto_place = false; m_auto_place = false;
} else { } else {
// shift pressed: move item // shift pressed: move item
if (button != 1) if (button != 1)
@ -3507,11 +3507,11 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
} }
m_selected_dragging = false; m_selected_dragging = false;
// Keep count of how many times right mouse button has been // Keep track of whether the mouse button be released
// clicked. One click is drag without dropping. Click + release // One click is drag without dropping. Click + release
// + click changes to drop one item when moved mode // + click changes to drop item when moved mode
if (button == 1 && m_selected_item != NULL) if (m_selected_item)
m_rmouse_auto_place = !m_rmouse_auto_place; m_auto_place = true;
} else if (updown == -1) { } else if (updown == -1) {
// Mouse has been moved and rmb is down and mouse pointer just // Mouse has been moved and rmb is down and mouse pointer just
// entered a new inventory field (checked in the entry-if, this // entered a new inventory field (checked in the entry-if, this
@ -3519,7 +3519,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
if (m_selected_item != NULL && s.isValid()) { if (m_selected_item != NULL && s.isValid()) {
// Move 1 item // Move 1 item
// TODO: middle mouse to move 10 items might be handy // TODO: middle mouse to move 10 items might be handy
if (m_rmouse_auto_place) { if (m_auto_place) {
// Only move an item if the destination slot is empty // Only move an item if the destination slot is empty
// or contains the same item type as what is going to be // or contains the same item type as what is going to be
// moved // moved

2
src/guiFormSpecMenu.h
View File

@ -411,7 +411,7 @@ protected:
u64 m_hovered_time = 0; u64 m_hovered_time = 0;
s32 m_old_tooltip_id = -1; s32 m_old_tooltip_id = -1;
bool m_rmouse_auto_place = false; bool m_auto_place = false;
bool m_allowclose = true; bool m_allowclose = true;
bool m_lock = false; bool m_lock = false;