Code review

This commit is contained in:
David Rowe 2018-01-20 10:07:23 +13:00
parent 94e6a68d41
commit 24dcc8788c
2 changed files with 1 additions and 3 deletions

View file

@ -236,7 +236,7 @@ void Pointer::generatePointerEvents(unsigned int pointerID, const PickResultPoin
}
// if we disable the pointer or disable hovering, send hoverEnd events after triggerEnd
if ((_hover || _prevHover) && ((!_enabled && _prevEnabled) || (!doHover && _prevDoHover))) {
if ((!_enabled && _prevEnabled) || (!doHover && _prevDoHover)) {
if (_prevHoveredObject.type == ENTITY) {
emit pointerManager->hoverEndEntity(_prevHoveredObject.objectID, hoveredEvent);
} else if (_prevHoveredObject.type == OVERLAY) {
@ -249,7 +249,6 @@ void Pointer::generatePointerEvents(unsigned int pointerID, const PickResultPoin
_prevHoveredObject = hoveredObject;
_prevButtons = buttons;
_prevEnabled = _enabled;
_prevHover = _hover;
_prevDoHover = doHover;
}

View file

@ -99,7 +99,6 @@ private:
PickedObject _prevHoveredObject;
Buttons _prevButtons;
bool _prevEnabled { false };
bool _prevHover { false };
bool _prevDoHover { false };
std::unordered_map<std::string, PickedObject> _triggeredObjects;