real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Some more C++ GUI cleanup.

Browse Source 
This was SVN commit r14436.
This commit is contained in:
JoshuaJB 2013-12-29 20:46:02 +00:00
parent e729f46789
commit 92fba32c5e
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/gui/CCheckBox.cpp
View File

@ -103,11 +103,12 @@ void CCheckBox::HandleMessage(SGUIMessage &Message)
{ {
bool checked; bool checked;
// Switch to opposite.
GUI<bool>::GetSetting(this, "checked", checked); GUI<bool>::GetSetting(this, "checked", checked);
checked = !checked; checked = !checked;
GUI<bool>::SetSetting(this, "checked", checked); GUI<bool>::SetSetting(this, "checked", checked);
break;
} break; }
default: default:
break; break;

17
source/gui/IGUIButtonBehavior.cpp
View File

@ -40,6 +40,7 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
{ {
bool enabled; bool enabled;
GUI<bool>::GetSetting(this, "enabled", enabled); GUI<bool>::GetSetting(this, "enabled", enabled);
CStrW soundPath;
// TODO Gee: easier access functions // TODO Gee: easier access functions
switch (Message.type) switch (Message.type)
{ {
@ -48,7 +49,6 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
if (!enabled) if (!enabled)
break; break;
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_enter", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_enter", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
} }
@ -59,7 +59,6 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
if (!enabled) if (!enabled)
break; break;
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_leave", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_leave", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
} }
@ -70,13 +69,11 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
{ {
if (!enabled) if (!enabled)
{ {
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_disabled", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_disabled", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
break; break;
} }
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_pressed", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_pressed", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
@ -99,13 +96,11 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
{ {
if (!enabled) if (!enabled)
{ {
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_disabled", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_disabled", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
break; break;
} }
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_pressed", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_pressed", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
@ -131,7 +126,6 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
if (m_PressedRight) if (m_PressedRight)
{ {
m_PressedRight = false; m_PressedRight = false;
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_released", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_released", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
} }
@ -146,7 +140,6 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage &Message)
if (m_Pressed) if (m_Pressed)
{ {
m_Pressed = false; m_Pressed = false;
CStrW soundPath;
if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_released", soundPath) == PSRETURN_OK && !soundPath.empty()) if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_released", soundPath) == PSRETURN_OK && !soundPath.empty())
g_SoundManager->PlayAsUI(soundPath.c_str(), false); g_SoundManager->PlayAsUI(soundPath.c_str(), false);
} }
@ -204,17 +197,15 @@ void IGUIButtonBehavior::DrawButton(const CRect &rect,
GUI<bool>::GetSetting(this, "enabled", enabled); GUI<bool>::GetSetting(this, "enabled", enabled);
if (!enabled) if (!enabled)
{
GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_disabled, sprite), cell_id, z, rect); GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_disabled, sprite), cell_id, z, rect);
} else if (m_MouseHovering)
else
if (m_MouseHovering)
{ {
if (m_Pressed) if (m_Pressed)
GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_pressed, sprite), cell_id, z, rect); GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_pressed, sprite), cell_id, z, rect);
else else
GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_over, sprite), cell_id, z, rect); GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_over, sprite), cell_id, z, rect);
} }
else GetGUI()->DrawSprite(sprite, cell_id, z, rect); else
GetGUI()->DrawSprite(sprite, cell_id, z, rect);
} }
} }