1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00

Force the popup window to be completely oin scs\reen. Fixes bug #2799727.

This commit is contained in:
Frank Zago
2009-06-02 03:01:17 +00:00
parent b2014c79d4
commit 8bc64d87e9

View File

@@ -10,6 +10,7 @@
#include "CGameInfo.h" #include "CGameInfo.h"
#include "CHeroWindow.h" #include "CHeroWindow.h"
#include "CMessage.h" #include "CMessage.h"
#include "CConfigHandler.h"
#include "SDL_framerate.h" #include "SDL_framerate.h"
#include "CConfigHandler.h" #include "CConfigHandler.h"
#include "CCreatureAnimation.h" #include "CCreatureAnimation.h"
@@ -629,6 +630,12 @@ CInfoPopup::CInfoPopup(SDL_Surface * Bitmap, int x, int y, bool Free)
pos.y = y; pos.y = y;
pos.h = bitmap->h; pos.h = bitmap->h;
pos.w = bitmap->w; pos.w = bitmap->w;
// Put the window back on screen if necessary
amax(pos.x, 0);
amax(pos.y, 0);
amin(pos.x, conf.cc.resx - bitmap->w);
amin(pos.y, conf.cc.resy - bitmap->h);
} }
CInfoPopup::CInfoPopup(SDL_Surface *Bitmap, bool Free) CInfoPopup::CInfoPopup(SDL_Surface *Bitmap, bool Free)