0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gui1 press buttons now play their sound at mouse release like the gui2

Browse source 
ones.
This commit is contained in:
fendrin 2013-03-30 14:16:57 +01:00
parent 7e89bcec7c
commit a243e70962
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/widgets/button.cpp
View file

@ -325,14 +325,22 @@ void button::mouse_motion(SDL_MouseMotionEvent const &event)
void button::mouse_down(SDL_MouseButtonEvent const &event)
{
if (hit(event.x, event.y) && event.button == SDL_BUTTON_LEFT) {
if (type_ == TYPE_CHECK || type_ == TYPE_RADIO) {
if (state_ == PRESSED_ACTIVE)
state_ = TOUCHED_PRESSED;
else if (state_ == ACTIVE)
state_ = TOUCHED_NORMAL;
} else {
state_ = PRESSED;
sound::play_UI_sound(game_config::sounds::button_press);
switch (type_) {
case TYPE_RADIO:
case TYPE_CHECK:
if (state_ == PRESSED_ACTIVE)
state_ = TOUCHED_PRESSED;
else if (state_ == ACTIVE)
state_ = TOUCHED_NORMAL;
break;
case TYPE_TURBO:
sound::play_UI_sound(game_config::sounds::button_press);
state_ = PRESSED;
break;
default:
state_ = PRESSED;
break;
}
}
}
@ -369,7 +377,6 @@ void button::mouse_up(SDL_MouseButtonEvent const &event)
if (state_ == TOUCHED_NORMAL) {
state_ = PRESSED_ACTIVE;
pressed_ = true;
sound::play_UI_sound(game_config::sounds::checkbox_release);
}
break;
case TYPE_PRESS:
@ -385,6 +392,8 @@ void button::mouse_up(SDL_MouseButtonEvent const &event)
pressed_ = true;
break;
}
if (pressed_)
sound::play_UI_sound(game_config::sounds::button_press);
}
void button::handle_event(const SDL_Event& event)