From 8292b80eac900ec5dd75d184063b7b35934e800a Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 21 Jan 2012 12:30:36 +0100 Subject: 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 --- src/game.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/game.cpp') 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(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); +} -- cgit v1.2.3-60-g2f50