Merge branch 'master' of ssh://manuel.mausz.at/foop

Conflicts:
	pacman-c++/mainwidget.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 819088c..343fe4c 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -236,6 +236,7 @@ void MainWidget::createGui()
   window->setAlignment(Qt::AlignLeft | Qt::AlignTop);
   //window->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   //window->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  window->setFixedSize(Constants::map_size_pixel.width, Constants::map_size_pixel.height);
 
   layout->addLayout(m_scoreLayout);
   layout->addWidget(window);
@@ -244,7 +245,6 @@ void MainWidget::createGui()
   setWindowTitle("pacman client");
 }
 
-
 void MainWidget::updateScore()
 {
   QMapIterator<Color::Color, Actor*> i(m_actors);