ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix for mouse button capture in windows when using SDL video driver. SDL video is intercepting mouse events causing Qt not to see them. Added an extra check to see what the SDL mouse button state is in addition to Qt check.

This commit is contained in:
mjbudd77 2021-05-27 20:56:05 -04:00
parent a1ae042775
commit 9013fad6a9
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/drivers/Qt/ConsoleViewerSDL.cpp
View File

@ -339,11 +339,44 @@ void ConsoleViewSDL_t::mouseReleaseEvent(QMouseEvent * event)
bool ConsoleViewSDL_t::getMouseButtonState( unsigned int btn )
{
//int x, y;
//uint32_t b;
//b = SDL_GetMouseState( &x, &y);
//printf("SDL Mouse: (%i,%i) 0x%x \n", x, y, b );
return (mouseButtonMask & btn) ? true : false;
bool isPressed = false;
if ( mouseButtonMask & btn )
{
isPressed = true;
}
else
{ // Check SDL mouse state just in case SDL is intercepting
// mouse events from window system causing Qt not to see them.
int x, y;
uint32_t b;
b = SDL_GetMouseState( &x, &y);
if ( btn & Qt::LeftButton )
{
if ( b & SDL_BUTTON(SDL_BUTTON_LEFT) )
{
isPressed = true;
}
}
if ( btn & Qt::RightButton )
{
if ( b & SDL_BUTTON(SDL_BUTTON_RIGHT) )
{
isPressed = true;
}
}
if ( btn & Qt::MiddleButton )
{
if ( b & SDL_BUTTON(SDL_BUTTON_MIDDLE) )
{
isPressed = true;
}
}
}
return isPressed;
}
void ConsoleViewSDL_t::getNormalizedCursorPos( double &x, double &y )