summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-21 12:30:36 +0100
committerAndrei Karas <akaras@inbox.ru>2012-01-30 19:53:07 +0300
commit8292b80eac900ec5dd75d184063b7b35934e800a (patch)
tree3ce68afff38d75d0cb1cdb89260f2b49f232e86a /src/game.cpp
parent502a0a0163e702af7334979a2eabfc4826a94091 (diff)
downloadplus-8292b80eac900ec5dd75d184063b7b35934e800a.tar.gz
plus-8292b80eac900ec5dd75d184063b7b35934e800a.tar.bz2
plus-8292b80eac900ec5dd75d184063b7b35934e800a.tar.xz
plus-8292b80eac900ec5dd75d184063b7b35934e800a.zip
Allow resizing of the game in windowed mode
Window positions are semi-smartly corrected as a result of the resize. Not supported when using OpenGL on Windows for now. Reviewed-by: Yohann Ferreira Conflicts: src/client.cpp src/client.h src/game.cpp src/gui/gui.cpp src/gui/widgets/window.cpp
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e48b37ebc..70468ebfd 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -376,8 +376,7 @@ Game::Game():
// Create the viewport
viewport = new Viewport;
- viewport->setDimension(gcn::Rectangle(0, 0, mainGraphics->mWidth,
- mainGraphics->mHeight));
+ viewport->setSize(mainGraphics->mWidth, mainGraphics->mHeight);
gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
top->add(viewport);
@@ -1636,8 +1635,13 @@ void Game::handleInput()
updateHistory(event);
checkKeys();
+ if (event.type == SDL_VIDEORESIZE)
+ {
+ // Let the client deal with this one (it'll pass down from there)
+ Client::instance()->resizeVideo(event.resize.w, event.resize.h);
+ }
// Keyboard events (for discontinuous keys)
- if (event.type == SDL_KEYDOWN)
+ else if (event.type == SDL_KEYDOWN)
{
wasDown = true;
@@ -1940,3 +1944,9 @@ void Game::closeDialogs()
deathNotice = nullptr;
}
}
+
+void Game::videoResized(int width, int height)
+{
+ viewport->setSize(width, height);
+ windowMenu->setPosition(width - 3 - windowMenu->getWidth(), 3);
+}