shadowvar cleanup

This commit is contained in:
Azaezel 2018-03-16 17:40:25 -05:00
parent 4be468b1ae
commit 0f3843cc5e

View file

@ -3026,25 +3026,25 @@ void GuiTreeViewCtrl::onMouseUp(const GuiEvent &event)
} }
hitFlags = 0; hitFlags = 0;
Item *item; Item *hitItem;
bool hitCheck = _hitTest( event.mousePoint, item, hitFlags ); bool hitCheck = _hitTest( event.mousePoint, hitItem, hitFlags );
mRenamingItem = NULL; mRenamingItem = NULL;
if( hitCheck ) if( hitCheck )
{ {
if ( event.mouseClickCount == 1 && !mMouseDragged && mPossibleRenameItem != NULL ) if ( event.mouseClickCount == 1 && !mMouseDragged && mPossibleRenameItem != NULL )
{ {
if ( item == mPossibleRenameItem ) if (hitItem == mPossibleRenameItem )
showItemRenameCtrl( item ); showItemRenameCtrl(hitItem);
} }
else // If mouseUp occurs on the same item as mouse down else // If mouseUp occurs on the same item as mouse down
{ {
bool wasSelected = isSelected( item ); bool wasSelected = isSelected(hitItem);
bool multiSelect = getSelectedItemsCount() > 1; bool multiSelect = getSelectedItemsCount() > 1;
if( wasSelected && multiSelect && item == mTempItem ) if( wasSelected && multiSelect && hitItem == mTempItem )
{ {
clearSelection(); clearSelection();
addSelection( item->mId ); addSelection( hitItem->mId );
} }
} }
} }