shift + click for quickmove (#278)
* shift + click for quickmove * shift click quick move in inventory
This commit is contained in:
@@ -829,6 +829,7 @@ enum EControllerActions
|
|||||||
ACTION_MENU_OTHER_STICK_LEFT,
|
ACTION_MENU_OTHER_STICK_LEFT,
|
||||||
ACTION_MENU_OTHER_STICK_RIGHT,
|
ACTION_MENU_OTHER_STICK_RIGHT,
|
||||||
ACTION_MENU_PAUSEMENU,
|
ACTION_MENU_PAUSEMENU,
|
||||||
|
ACTION_MENU_QUICK_MOVE,
|
||||||
|
|
||||||
#ifdef _DURANGO
|
#ifdef _DURANGO
|
||||||
ACTION_MENU_GTC_PAUSE,
|
ACTION_MENU_GTC_PAUSE,
|
||||||
|
|||||||
@@ -1304,9 +1304,9 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
int buttonNum=0; // 0 = LeftMouse, 1 = RightMouse
|
int buttonNum=0; // 0 = LeftMouse, 1 = RightMouse
|
||||||
BOOL quickKeyHeld=FALSE; // Represents shift key on PC
|
BOOL quickKeyHeld=false; // Represents shift key on PC
|
||||||
|
BOOL quickKeyDown = false; // Represents shift key on PC
|
||||||
BOOL validKeyPress = FALSE;
|
BOOL validKeyPress = false;
|
||||||
bool itemEditorKeyPress = false;
|
bool itemEditorKeyPress = false;
|
||||||
|
|
||||||
// Ignore input from other players
|
// Ignore input from other players
|
||||||
@@ -1323,23 +1323,41 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
|
|||||||
#ifdef __ORBIS__
|
#ifdef __ORBIS__
|
||||||
case ACTION_MENU_TOUCHPAD_PRESS:
|
case ACTION_MENU_TOUCHPAD_PRESS:
|
||||||
#endif
|
#endif
|
||||||
if(!bRepeat)
|
if (!bRepeat)
|
||||||
{
|
{
|
||||||
validKeyPress = TRUE;
|
validKeyPress = TRUE;
|
||||||
|
|
||||||
// Standard left click
|
// Standard left click
|
||||||
buttonNum = 0;
|
buttonNum = 0;
|
||||||
quickKeyHeld = FALSE;
|
if (KMInput.IsKeyDown(VK_SHIFT))
|
||||||
|
|
||||||
if( IsSectionSlotList( m_eCurrSection ) )
|
|
||||||
{
|
{
|
||||||
int currentIndex = getCurrentIndex( m_eCurrSection ) - getSectionStartOffset(m_eCurrSection);
|
{
|
||||||
|
validKeyPress = TRUE;
|
||||||
|
|
||||||
bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
|
// Shift and left click
|
||||||
if ( bSlotHasItem )
|
buttonNum = 0;
|
||||||
ui.PlayUISFX(eSFX_Press);
|
quickKeyHeld = TRUE;
|
||||||
|
if (IsSectionSlotList(m_eCurrSection))
|
||||||
|
{
|
||||||
|
int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
|
||||||
|
|
||||||
|
bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
|
||||||
|
if (bSlotHasItem)
|
||||||
|
ui.PlayUISFX(eSFX_Press);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (IsSectionSlotList(m_eCurrSection))
|
||||||
|
{
|
||||||
|
int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
|
||||||
|
|
||||||
|
bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
|
||||||
|
if (bSlotHasItem)
|
||||||
|
ui.PlayUISFX(eSFX_Press);
|
||||||
|
}
|
||||||
|
//
|
||||||
}
|
}
|
||||||
//
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ACTION_MENU_X:
|
case ACTION_MENU_X:
|
||||||
@@ -1361,6 +1379,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ACTION_MENU_Y:
|
case ACTION_MENU_Y:
|
||||||
if(!bRepeat)
|
if(!bRepeat)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1012,6 +1012,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
|
|||||||
case ACTION_MENU_PAUSEMENU: kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
|
case ACTION_MENU_PAUSEMENU: kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
|
||||||
case ACTION_MENU_LEFT_SCROLL: kbDown = KMInput.IsKeyDown('Q'); kbPressed = KMInput.IsKeyPressed('Q'); kbReleased = KMInput.IsKeyReleased('Q'); break;
|
case ACTION_MENU_LEFT_SCROLL: kbDown = KMInput.IsKeyDown('Q'); kbPressed = KMInput.IsKeyPressed('Q'); kbReleased = KMInput.IsKeyReleased('Q'); break;
|
||||||
case ACTION_MENU_RIGHT_SCROLL: kbDown = KMInput.IsKeyDown('E'); kbPressed = KMInput.IsKeyPressed('E'); kbReleased = KMInput.IsKeyReleased('E'); break;
|
case ACTION_MENU_RIGHT_SCROLL: kbDown = KMInput.IsKeyDown('E'); kbPressed = KMInput.IsKeyPressed('E'); kbReleased = KMInput.IsKeyReleased('E'); break;
|
||||||
|
case ACTION_MENU_QUICK_MOVE: kbDown = KMInput.IsKeyDown(VK_SHIFT); kbPressed = KMInput.IsKeyPressed(VK_SHIFT); kbReleased = KMInput.IsKeyReleased(VK_SHIFT); break;
|
||||||
}
|
}
|
||||||
pressed = pressed || kbPressed;
|
pressed = pressed || kbPressed;
|
||||||
released = released || kbReleased;
|
released = released || kbReleased;
|
||||||
|
|||||||
Reference in New Issue
Block a user