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

Merge branch 'feature/freegfx' into refactoring/guiClasses

Browse Source 
Conflicts:
	client/windows/CHeroWindow.cpp
	client/windows/CQuestLog.cpp
	client/windows/GUIClasses.cpp
This commit is contained in:
Ivan Savenko
2014-08-03 18:50:59 +03:00
parent 7390647cd5 9f5704f8ba
commit 77a73fbaa9
15 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/widgets/Buttons.cpp
View File

@@ -196,7 +196,7 @@ void CButton::clickRight(tribool down, bool previousState)
void CButton::hover (bool on)
{
if(hoverable)
if(hoverable && !isBlocked())
{
if(on)
setState(HIGHLIGHTED);
@@ -204,8 +204,8 @@ void CButton::hover (bool on)
setState(NORMAL);
}
if(pressedL && on)
setState(PRESSED);
/*if(pressedL && on) // WTF is this? When this is used?
setState(PRESSED);*/
std::string name = hoverTexts[getState()].empty()
? hoverTexts[getState()]