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

Cleaned up EventDispatcher code

Browse Source
This commit is contained in:
Ivan Savenko 2023-06-11 18:27:42 +03:00
parent d4aa778547
commit e9788e2904
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
client/gui/EventDispatcher.cpp
View File

@ -112,18 +112,6 @@ void EventDispatcher::dispatchShortcutReleased(const std::vector<EShortcut> & sh
} }
} }
EventDispatcher::EventReceiversList & EventDispatcher::getListForMouseButton(MouseButton button)
{
switch (button)
{
case MouseButton::LEFT:
return lclickable;
case MouseButton::RIGHT:
return rclickable;
}
throw std::runtime_error("Invalid mouse button in getListForMouseButton");
}
void EventDispatcher::dispatchMouseDoubleClick(const Point & position) void EventDispatcher::dispatchMouseDoubleClick(const Point & position)
{ {
bool doubleClicked = false; bool doubleClicked = false;
@ -147,49 +135,58 @@ void EventDispatcher::dispatchMouseDoubleClick(const Point & position)
void EventDispatcher::dispatchMouseButtonPressed(const MouseButton & button, const Point & position) void EventDispatcher::dispatchMouseButtonPressed(const MouseButton & button, const Point & position)
{ {
handleMouseButtonClick(getListForMouseButton(button), button, true); if (button == MouseButton::LEFT)
handleLeftButtonClick(true);
if (button == MouseButton::RIGHT)
handleRightButtonClick(true);
} }
void EventDispatcher::dispatchMouseButtonReleased(const MouseButton & button, const Point & position) void EventDispatcher::dispatchMouseButtonReleased(const MouseButton & button, const Point & position)
{ {
handleMouseButtonClick(getListForMouseButton(button), button, false); if (button == MouseButton::LEFT)
handleLeftButtonClick(false);
if (button == MouseButton::RIGHT)
handleRightButtonClick(false);
} }
void EventDispatcher::handleMouseButtonClick(EventReceiversList & interestedObjs, MouseButton btn, bool isPressed) void EventDispatcher::handleRightButtonClick(bool isPressed)
{ {
auto hlp = interestedObjs; auto hlp = rclickable;
for(auto & i : hlp) for(auto & i : hlp)
{ {
if(!vstd::contains(interestedObjs, i)) if(!vstd::contains(rclickable, i))
continue; continue;
auto prev = i->isMouseButtonPressed(btn); if( isPressed && i->receiveEvent(GH.getCursorPosition(), AEventsReceiver::LCLICK))
i->showPopupWindow();
if(!isPressed) if(!isPressed)
i->currentMouseState[btn] = isPressed; i->closePopupWindow();
}
}
if( btn == MouseButton::LEFT && i->receiveEvent(GH.getCursorPosition(), AEventsReceiver::LCLICK)) void EventDispatcher::handleLeftButtonClick(bool isPressed)
{
auto hlp = lclickable;
for(auto & i : hlp)
{
if(!vstd::contains(lclickable, i))
continue;
auto prev = i->isMouseButtonPressed(MouseButton::LEFT);
if(!isPressed)
i->currentMouseState[MouseButton::LEFT] = isPressed;
if( i->receiveEvent(GH.getCursorPosition(), AEventsReceiver::LCLICK))
{ {
if(isPressed) if(isPressed)
i->currentMouseState[btn] = isPressed; i->currentMouseState[MouseButton::LEFT] = isPressed;
i->clickLeft(isPressed, prev); i->clickLeft(isPressed, prev);
} }
else if( btn == MouseButton::RIGHT && i->receiveEvent(GH.getCursorPosition(), AEventsReceiver::RCLICK))
{
if(isPressed)
i->currentMouseState[btn] = isPressed;
if (isPressed)
i->showPopupWindow();
else
i->closePopupWindow();
}
else if(!isPressed) else if(!isPressed)
{ {
if (btn == MouseButton::LEFT) i->clickLeft(boost::logic::indeterminate, prev);
i->clickLeft(boost::logic::indeterminate, prev);
if (btn == MouseButton::RIGHT)
i->closePopupWindow();
} }
} }
} }

5
client/gui/EventDispatcher.h
View File

@ -34,9 +34,8 @@ class EventDispatcher
EventReceiversList textInterested; EventReceiversList textInterested;
EventReceiversList panningInterested; EventReceiversList panningInterested;
EventReceiversList & getListForMouseButton(MouseButton button); void handleLeftButtonClick(bool isPressed);
void handleRightButtonClick(bool isPressed);
void handleMouseButtonClick(EventReceiversList & interestedObjs, MouseButton btn, bool isPressed);
template<typename Functor> template<typename Functor>
void processLists(ui16 activityFlag, const Functor & cb); void processLists(ui16 activityFlag, const Functor & cb);