games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Merge pull request #2250 from IvanSavenko/event_handling_fixes

Browse Source 
Slider input event fix
This commit is contained in:
Ivan Savenko
2023-06-25 17:39:55 +03:00
committed by GitHub
parent b93b8f45db a505cc464e
commit a84ccb37c2
34 changed files with 133 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/gui/EventDispatcher.cpp
View File

@@ -31,6 +31,7 @@ void EventDispatcher::processLists(ui16 activityFlag, const Functor & cb)
processList(AEventsReceiver::SHOW_POPUP, rclickable);
processList(AEventsReceiver::HOVER, hoverable);
processList(AEventsReceiver::MOVE, motioninterested);
processList(AEventsReceiver::DRAG, draginterested);
processList(AEventsReceiver::KEYBOARD, keyinterested);
processList(AEventsReceiver::TIME, timeinterested);
processList(AEventsReceiver::WHEEL, wheelInterested);
@@ -63,7 +64,7 @@ void EventDispatcher::dispatchTimer(uint32_t msPassed)
for (auto & elem : hlp)
{
if(!vstd::contains(timeinterested,elem)) continue;
(elem)->tick(msPassed);
elem->tick(msPassed);
}
}
@@ -270,7 +271,7 @@ void EventDispatcher::dispatchGesturePinch(const Point & initialPosition, double
}
}
void EventDispatcher::dispatchMouseMoved(const Point & position)
void EventDispatcher::dispatchMouseMoved(const Point & distance, const Point & position)
{
EventReceiversList newlyHovered;
@@ -288,8 +289,8 @@ void EventDispatcher::dispatchMouseMoved(const Point & position)
{
if (elem->isHovered())
{
(elem)->hover(false);
(elem)->hoveredState = false;
elem->hover(false);
elem->hoveredState = false;
}
}
}
@@ -308,8 +309,16 @@ void EventDispatcher::dispatchMouseMoved(const Point & position)
continue;
if(elem->receiveEvent(position, AEventsReceiver::HOVER))
{
(elem)->mouseMoved(position);
}
elem->mouseMoved(position, distance);
}
}
void EventDispatcher::dispatchMouseDragged(const Point & currentPosition, const Point & lastUpdateDistance)
{
EventReceiversList diCopy = draginterested;
for(auto & elem : diCopy)
{
if (elem->mouseClickedState)
elem->mouseDragged(currentPosition, lastUpdateDistance);
}
}