backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Fix mouse pos when zoom=2 > fullscreen

Browse Source
This commit is contained in:
Mathieu Schroeter 2018-06-25 22:53:10 +02:00
parent 375388b22f
commit 3ebe028640
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/event.cxx
View File

@ -1721,11 +1721,11 @@ CEvent::GetMousePos ()
// Initialise le mode full screen ou non. // Initialise le mode full screen ou non.
void void
CEvent::SetFullScreen (bool bFullScreen) CEvent::SetFullScreen (bool bFullScreen, double prevScale)
{ {
int x, y; int x, y;
SDL_GetMouseState (&x, &y); SDL_GetMouseState (&x, &y);
this->m_pPixmap->FromDisplayToGame (x, y); this->m_pPixmap->FromDisplayToGame (x, y, prevScale);
g_bFullScreen = bFullScreen; g_bFullScreen = bFullScreen;
@ -4248,8 +4248,7 @@ CEvent::ChangeButtons (Sint32 message)
{ {
auto zoom = g_zoom; auto zoom = g_zoom;
g_zoom = 1; g_zoom = 1;
SetFullScreen (true); SetFullScreen (true, zoom);
SetWindowSize (zoom, 1);
break; break;
} }
case EV_BUTTON4: case EV_BUTTON4:

2
src/event.h
View File

@ -98,7 +98,7 @@ public:
Point GetMousePos (); Point GetMousePos ();
void void
Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * pMovie); Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * pMovie);
void SetFullScreen (bool bFullScreen); void SetFullScreen (bool bFullScreen, double prevScale = 1);
Sint32 GetWorld (); Sint32 GetWorld ();
Sint32 GetPhysicalWorld (); Sint32 GetPhysicalWorld ();
Sint32 GetImageWorld (); Sint32 GetImageWorld ();