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

fix bug #12604...

Browse source 
...(mouse scroll continues to scroll after the mouse leaves the window)
This commit is contained in:
Tomasz Śniatowski 2008-11-21 22:05:43 +01:00
parent 9be5395f5c
commit 4dba409b27
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/controller_base.cpp
View file

@ -129,20 +129,25 @@ bool controller_base::handle_scroll(CKey& key, int mousex, int mousey, int mouse
{
bool scrolling = false;
const int scroll_threshold = (preferences::mouse_scroll_enabled()) ? 5 : 0;
bool mouse_in_window = SDL_GetAppState() & SDL_APPMOUSEFOCUS;
if ((key[SDLK_UP] && have_keyboard_focus()) || mousey < scroll_threshold) {
if ((key[SDLK_UP] && have_keyboard_focus())
|| (mousey < scroll_threshold && mouse_in_window)) {
get_display().scroll(0,-preferences::scroll_speed());
scrolling = true;
}
if ((key[SDLK_DOWN] && have_keyboard_focus()) || mousey > get_display().h() - scroll_threshold) {
if ((key[SDLK_DOWN] && have_keyboard_focus())
|| (mousey > get_display().h() - scroll_threshold && mouse_in_window)) {
get_display().scroll(0,preferences::scroll_speed());
scrolling = true;
}
if ((key[SDLK_LEFT] && have_keyboard_focus()) || mousex < scroll_threshold) {
if ((key[SDLK_LEFT] && have_keyboard_focus())
|| (mousex < scroll_threshold && mouse_in_window)) {
get_display().scroll(-preferences::scroll_speed(),0);
scrolling = true;
}
if ((key[SDLK_RIGHT] && have_keyboard_focus()) || mousex > get_display().w() - scroll_threshold) {
if ((key[SDLK_RIGHT] && have_keyboard_focus())
|| (mousex > get_display().w() - scroll_threshold && mouse_in_window)) {
get_display().scroll(preferences::scroll_speed(),0);
scrolling = true;
}