X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=seascene.cpp;h=7b0bad4835cc48ff16c1e0842e26e7d79607d1ad;hb=4521cae82611f549d31287457a31a553ea05a0f4;hp=5fb9c8ffc69d707d72fe7c1938610eab96307410;hpb=f57795d57bd0a5a263fff84a98d39dcbc239f47f;p=ghostsoverboard

diff --git a/seascene.cpp b/seascene.cpp
index 5fb9c8f..7b0bad4 100644
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -335,6 +335,7 @@ void SeaScene::pause(bool paused)
         if (paused == false)
         {
      //       qDebug() << "starting to move again";
+            emit fullscreenRequested();
             emit pauseOff();
             screenLitKeeper_.keepScreenLit(true);
             if (pPausetextItem_)
@@ -440,9 +441,11 @@ void SeaScene::handleScreenTapped()
     clearSelection();
 
     //The user propably went to paused state just to access menu, so unpause
-
-    pPauseAction_->setChecked(false);
-
+    //unless status bar was requested
+    if (pItem != pMinimizeItem_)
+    {
+        pPauseAction_->setChecked(false);
+    }
 }
 
 
@@ -458,7 +461,7 @@ void SeaScene::createMenuItems()
     pPausetextItem_ = new QGraphicsTextItem;
     pPausetextItem_->setHtml("<font size = \"5\" color = darkorange> Game paused. Tap to continue.");
     pPausetextItem_->setZValue(1000);
-    pPausetextItem_->setPos(200,50);
+    pPausetextItem_->setPos(165,50);
     addItem(pPausetextItem_);
     pPausetextItem_->hide();
 
@@ -483,7 +486,7 @@ void SeaScene::createMenuItems()
     prepareForMenu(pAboutItem_);
 
     pMinimizeItem_ = new QGraphicsTextItem;
-    pMinimizeItem_->setHtml(tr("Go to <br> background").prepend(menufonthtml));
+    pMinimizeItem_->setHtml(tr("Show <br> status bar").prepend(menufonthtml));
     prepareForMenu(pMinimizeItem_);
 
     pQuitItem_ = new QGraphicsTextItem;
@@ -500,11 +503,19 @@ void SeaScene::prepareForMenu(QGraphicsItem * pItem)
     //Their coordinates are given relative to the parent.
 
 
+
+
+    int itemsPerRow = 3;
+
     pItem->setParentItem(pPausetextItem_);
     pItem->setZValue(1000);
     pItem->setFlag(QGraphicsItem::ItemIsSelectable);
-    pItem->setY(150);
-    pItem->setX(menuItemCount_++*160-150);
+
+    int row = menuItemCount_/(itemsPerRow);
+    pItem->setY(150+row*120);
+    pItem->setX(((menuItemCount_%(itemsPerRow))*180+5));
+
+    menuItemCount_++;
  }