diff options
| author | totycro <totycro@unknown-horizons.org> | 2011-04-06 17:08:30 +0200 |
|---|---|---|
| committer | totycro <totycro@unknown-horizons.org> | 2011-04-06 17:08:30 +0200 |
| commit | 5ab41f9cbc23391fc4965826be66d8d245ff04fc (patch) | |
| tree | 5e64e354283cf303f9ed8517392d05d758baf664 | |
| parent | 7ca893e9357e9153ba35a248564c1134af0f1f54 (diff) | |
| download | foop-5ab41f9cbc23391fc4965826be66d8d245ff04fc.tar.gz foop-5ab41f9cbc23391fc4965826be66d8d245ff04fc.tar.bz2 foop-5ab41f9cbc23391fc4965826be66d8d245ff04fc.zip | |
Fixed size for drawing area
| -rw-r--r-- | pacman-c++/client.cpp | 10 | ||||
| -rw-r--r-- | pacman-c++/mainwidget.cpp | 6 |
2 files changed, 8 insertions, 8 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() | |||
| 4 | { | 4 | { |
| 5 | QAction *quitAction = new QAction("E&xit", this); | 5 | QAction *quitAction = new QAction("E&xit", this); |
| 6 | connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); | 6 | connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); |
| 7 | 7 | ||
| 8 | QMenu *fileMenu = menuBar()->addMenu("File"); | 8 | QMenu *fileMenu = menuBar()->addMenu("File"); |
| 9 | fileMenu->addAction(quitAction); | 9 | fileMenu->addAction(quitAction); |
| 10 | 10 | ||
| 11 | mainWidget = new MainWidget(); | 11 | mainWidget = new MainWidget(); |
| 12 | setCentralWidget(mainWidget); | 12 | setCentralWidget(mainWidget); |
| 13 | } | 13 | } |
| @@ -16,11 +16,11 @@ Client::Client() | |||
| 16 | int main(int argc, char ** argv) { | 16 | int main(int argc, char ** argv) { |
| 17 | QApplication app(argc, argv); | 17 | QApplication app(argc, argv); |
| 18 | app.setApplicationName("pacman-client"); | 18 | app.setApplicationName("pacman-client"); |
| 19 | 19 | ||
| 20 | qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); | 20 | qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); |
| 21 | 21 | ||
| 22 | Client client; | 22 | Client client; |
| 23 | client.show(); | 23 | client.show(); |
| 24 | 24 | ||
| 25 | return app.exec(); | 25 | return app.exec(); |
| 26 | } | 26 | } |
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp index ad11bf2..8f79485 100644 --- a/pacman-c++/mainwidget.cpp +++ b/pacman-c++/mainwidget.cpp | |||
| @@ -184,9 +184,9 @@ Transmission::map_t createDummyMap() | |||
| 184 | map[5][5] |= Color::blue; | 184 | map[5][5] |= Color::blue; |
| 185 | map[5][5] |= Transmission::pacman; | 185 | map[5][5] |= Transmission::pacman; |
| 186 | map[5][5] |= Transmission::direction_left; | 186 | map[5][5] |= Transmission::direction_left; |
| 187 | 187 | ||
| 188 | map[7][5] |= Transmission::bonuspoint;*/ | 188 | map[7][5] |= Transmission::bonuspoint;*/ |
| 189 | 189 | ||
| 190 | map[15][15] |= Color::blue; | 190 | map[15][15] |= Color::blue; |
| 191 | map[15][15] |= Transmission::pacman; | 191 | map[15][15] |= Transmission::pacman; |
| 192 | map[15][15] |= Transmission::direction_left; | 192 | map[15][15] |= Transmission::direction_left; |
| @@ -238,6 +238,7 @@ void MainWidget::createGui() | |||
| 238 | window->setAlignment(Qt::AlignLeft | Qt::AlignTop); | 238 | window->setAlignment(Qt::AlignLeft | Qt::AlignTop); |
| 239 | //window->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); | 239 | //window->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); |
| 240 | //window->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); | 240 | //window->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); |
| 241 | window->setFixedSize(Constants::map_size_pixel.width, Constants::map_size_pixel.height); | ||
| 241 | 242 | ||
| 242 | layout->addLayout(m_scoreLayout); | 243 | layout->addLayout(m_scoreLayout); |
| 243 | layout->addWidget(window); | 244 | layout->addWidget(window); |
| @@ -246,7 +247,6 @@ void MainWidget::createGui() | |||
| 246 | setWindowTitle("pacman client"); | 247 | setWindowTitle("pacman client"); |
| 247 | } | 248 | } |
| 248 | 249 | ||
| 249 | |||
| 250 | void MainWidget::updateScore() | 250 | void MainWidget::updateScore() |
| 251 | { | 251 | { |
| 252 | QMapIterator<Color::Color, Actor*> i(m_actors); | 252 | QMapIterator<Color::Color, Actor*> i(m_actors); |
