games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +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
Download Patch File Download Diff File Expand all files Collapse all files

18
client/widgets/Buttons.cpp
View File

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