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

Conflicts:
	pacman-c++/mainwidget.cpp

2 files changed, 6 insertions, 6 deletions

diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index a5cb7c5..cf3c291 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -4,10 +4,10 @@ Client::Client()
 {
   QAction *quitAction = new QAction("E&xit", this);
   connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
-  
+
   QMenu *fileMenu = menuBar()->addMenu("File");
   fileMenu->addAction(quitAction);
-  
+
   mainWidget = new MainWidget();
   setCentralWidget(mainWidget);
 }
@@ -16,11 +16,11 @@ Client::Client()
 int main(int argc, char ** argv) {
   QApplication app(argc, argv);
   app.setApplicationName("pacman-client");
-  
+
   qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
-  
+
   Client client;
   client.show();
-  
+
   return app.exec();
 }
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);