Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Right mouse button behaviour for craft/inventory If right mousebutton clicked once then don't drop single items into slots. If right mouse button has been clicked and held a second time, drop items as the mouse is moved. In the second case (automatically drop/place items as mouse is moved) only auto-drop into blank slots, or slots that contain the same item.

This commit is contained in:
Craig Robbins 2014-10-09 17:53:20 +10:00
parent d7b3046cf6
commit f6912f4241
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/guiFormSpecMenu.cpp
View File

@ -124,6 +124,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
m_tooltip_element(NULL), m_tooltip_element(NULL),
m_hovered_time(0), m_hovered_time(0),
m_old_tooltip_id(-1), m_old_tooltip_id(-1),
m_rmouse_auto_place(false),
m_allowclose(true), m_allowclose(true),
m_lock(false), m_lock(false),
m_form_src(fsrc), m_form_src(fsrc),
@ -3153,6 +3154,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
m_selected_amount = s_count; m_selected_amount = s_count;
m_selected_dragging = true; m_selected_dragging = true;
m_rmouse_auto_place = false;
} }
} }
else { // m_selected_item != NULL else { // m_selected_item != NULL
@ -3205,6 +3207,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
// clicked. One click is drag without dropping. Click + release
// + click changes to drop one item when moved mode
if(button == 1 && m_selected_item != NULL)
m_rmouse_auto_place = !m_rmouse_auto_place;
} }
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
@ -3213,9 +3220,20 @@ 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) {
// Only move an item if the destination slot is empty
// or contains the same item type as what is going to be
// moved
InventoryList *list_from = inv_selected->getList(m_selected_item->listname);
InventoryList *list_to = inv_s->getList(s.listname);
assert(list_from && list_to);
ItemStack stack_from = list_from->getItem(m_selected_item->i);
ItemStack stack_to = list_to->getItem(s.i);
if (stack_to.empty() || stack_to.name == stack_from.name)
move_amount = 1; move_amount = 1;
} }
} }
}
// Possibly send inventory action to server // Possibly send inventory action to server
if(move_amount > 0) if(move_amount > 0)

2
src/guiFormSpecMenu.h
View File

@ -328,6 +328,8 @@ protected:
s32 m_old_tooltip_id; s32 m_old_tooltip_id;
std::string m_old_tooltip; std::string m_old_tooltip;
bool m_rmouse_auto_place;
bool m_allowclose; bool m_allowclose;
bool m_lock; bool m_lock;
v2u32 m_lockscreensize; v2u32 m_lockscreensize;