games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

Fix button interaction with hotkey & mouse

Browse Source
This commit is contained in:
Ivan Savenko 2023-05-18 13:08:38 +03:00
parent d5d0ca96a8
commit ff1c94541f
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client/widgets/Buttons.cpp
View File

@ -173,22 +173,28 @@ void CButton::clickLeft(tribool down, bool previousState)
if (down) if (down)
{ {
if (!soundDisabled) if (getState() != PRESSED)
CCS->soundh->playSound(soundBase::button); {
setState(PRESSED); if (!soundDisabled)
} CCS->soundh->playSound(soundBase::button);
else if(hoverable && isHovered()) setState(PRESSED);
setState(HIGHLIGHTED);
else
setState(NORMAL);
if (actOnDown && down) if (actOnDown)
{ onButtonClicked();
onButtonClicked(); }
} }
else if (!actOnDown && previousState && (down==false)) else
{ {
onButtonClicked(); if (getState() == PRESSED)
{
if(hoverable && isHovered())
setState(HIGHLIGHTED);
else
setState(NORMAL);
if (!actOnDown && previousState && (down == false))
onButtonClicked();
}
} }
} }