games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-02 22:05:43 +02:00
Code Issues Releases Activity

Implemented scaling of mouse input events

Browse Source
This commit is contained in:
Ivan Savenko 2024-07-22 11:11:11 +00:00
parent 748a3a1b64
commit 954b6b0947
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/eventsSDL/InputSourceMouse.cpp
View File

@ -16,6 +16,8 @@
#include "../gui/EventDispatcher.h" #include "../gui/EventDispatcher.h"
#include "../gui/MouseButton.h" #include "../gui/MouseButton.h"
#include "../render/IScreenHandler.h"
#include "../../lib/Point.h" #include "../../lib/Point.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
@ -30,8 +32,8 @@ InputSourceMouse::InputSourceMouse()
void InputSourceMouse::handleEventMouseMotion(const SDL_MouseMotionEvent & motion) void InputSourceMouse::handleEventMouseMotion(const SDL_MouseMotionEvent & motion)
{ {
Point newPosition(motion.x, motion.y); Point newPosition = Point(motion.x, motion.y) / GH.screenHandler().getScalingFactor();
Point distance(-motion.xrel, -motion.yrel); Point distance= Point(-motion.xrel, -motion.yrel) / GH.screenHandler().getScalingFactor();
mouseButtonsMask = motion.state; mouseButtonsMask = motion.state;
@ -45,7 +47,7 @@ void InputSourceMouse::handleEventMouseMotion(const SDL_MouseMotionEvent & motio
void InputSourceMouse::handleEventMouseButtonDown(const SDL_MouseButtonEvent & button) void InputSourceMouse::handleEventMouseButtonDown(const SDL_MouseButtonEvent & button)
{ {
Point position(button.x, button.y); Point position = Point(button.x, button.y) / GH.screenHandler().getScalingFactor();
switch(button.button) switch(button.button)
{ {
@ -67,12 +69,12 @@ void InputSourceMouse::handleEventMouseButtonDown(const SDL_MouseButtonEvent & b
void InputSourceMouse::handleEventMouseWheel(const SDL_MouseWheelEvent & wheel) void InputSourceMouse::handleEventMouseWheel(const SDL_MouseWheelEvent & wheel)
{ {
GH.events().dispatchMouseScrolled(Point(wheel.x, wheel.y), GH.getCursorPosition()); GH.events().dispatchMouseScrolled(Point(wheel.x, wheel.y) / GH.screenHandler().getScalingFactor(), GH.getCursorPosition());
} }
void InputSourceMouse::handleEventMouseButtonUp(const SDL_MouseButtonEvent & button) void InputSourceMouse::handleEventMouseButtonUp(const SDL_MouseButtonEvent & button)
{ {
Point position(button.x, button.y); Point position = Point(button.x, button.y) / GH.screenHandler().getScalingFactor();
switch(button.button) switch(button.button)
{ {