games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merged two mouse button enums

Browse Source
This commit is contained in:
Ivan Savenko
2023-02-02 16:22:19 +02:00
parent 6669ffd4b3
commit 860fe43131
8 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/gui/CIntObject.cpp
View File

@@ -146,18 +146,18 @@ void CIntObject::deactivate(ui16 what)
GH.handleElementDeActivate(this, what);
}
void CIntObject::click(EIntObjMouseBtnType btn, tribool down, bool previousState)
void CIntObject::click(MouseButton btn, tribool down, bool previousState)
{
switch(btn)
{
default:
case EIntObjMouseBtnType::LEFT:
case MouseButton::LEFT:
clickLeft(down, previousState);
break;
case EIntObjMouseBtnType::MIDDLE:
case MouseButton::MIDDLE:
clickMiddle(down, previousState);
break;
case EIntObjMouseBtnType::RIGHT:
case MouseButton::RIGHT:
clickRight(down, previousState);
break;
}
@@ -348,8 +348,8 @@ void CKeyShortcut::keyPressed(const SDL_KeyboardEvent & key)
if(vstd::contains(assignedKeys,key.keysym.sym)
|| vstd::contains(assignedKeys, CGuiHandler::numToDigit(key.keysym.sym)))
{
bool prev = mouseState(EIntObjMouseBtnType::LEFT);
updateMouseState(EIntObjMouseBtnType::LEFT, key.state == SDL_PRESSED);
bool prev = mouseState(MouseButton::LEFT);
updateMouseState(MouseButton::LEFT, key.state == SDL_PRESSED);
clickLeft(key.state == SDL_PRESSED, prev);
}