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

Confine special handling to only the affected platforms

Browse source
This commit is contained in:
Gunter Labes 2024-01-03 16:51:40 +01:00 • committed by GitHub
parent 13d5682487
commit 3e41aa0dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/controller_base.cpp
View file

@ -235,6 +235,9 @@ void controller_base::handle_event(const SDL_Event& event)
// Right and down are positive in Wesnoth's map.
// Right and up are positive in SDL_MouseWheelEvent on all platforms:
// https://wiki.libsdl.org/SDL2/SDL_MouseWheelEvent
#if defined(_WIN32) || defined(__APPLE__)
mh_base.mouse_wheel(event.wheel.x, -event.wheel.y, is_browsing());
#else
// Except right is wrongly negative on X11 in SDL < 2.0.18:
// https://github.com/libsdl-org/SDL/pull/4700
// https://github.com/libsdl-org/SDL/commit/515b7e9
@ -243,9 +246,6 @@ void controller_base::handle_event(const SDL_Event& event)
// Fixes issues #3362 and #7404, which are a regression caused by pull #2481 that fixed issue #2218.
{
static int xmul = 0;
#if defined(_WIN32) || defined(__APPLE__)
xmul = 1;
#else
if(xmul == 0) {
xmul = 1;
const char* video_driver = SDL_GetCurrentVideoDriver();
@ -259,9 +259,9 @@ void controller_base::handle_event(const SDL_Event& event)
}
}
}
#endif
mh_base.mouse_wheel(xmul * event.wheel.x, -event.wheel.y, is_browsing());
}
#endif
break;
case TIMER_EVENT: