1 files changed, 65 insertions, 39 deletions

diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index 04cfb97..1790110 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -21,3 +21,4 @@
 
-#include <qpe/config.h>
+#include <qtopia/config.h>
+#include <qtopia/qpeapplication.h>
 
@@ -71,3 +72,3 @@ static const char *pix_mine[]={
 static const int maxGrid = 28;
-static const int minGrid = 9;
+static const int minGrid = 12;
 
@@ -186,3 +187,5 @@ void Mine::paint( QPainter* p, const QColorGroup &cg, const QRect& cr )
     int y = cr.y();
-    if ( !knownField ) {
+    if ( !knownField || knownField->width() != cr.width() ||
+         knownField->height() != cr.height() ) {
+        delete knownField;
         knownField = new QPixmap( cr.width(), cr.height() );
@@ -190,3 +193,3 @@ void Mine::paint( QPainter* p, const QColorGroup &cg, const QRect& cr )
         QBrush br( cg.button().dark(115) );
-        qDrawWinButton( &pp, cr, cg, TRUE, &br );
+        qDrawWinButton( &pp, QRect( 0, 0, cr.width(), cr.height() ), cg, TRUE, &br );
     }
@@ -195,3 +198,5 @@ void Mine::paint( QPainter* p, const QColorGroup &cg, const QRect& cr )
 
-    if ( !unknownField ) {
+    if ( !unknownField || unknownField->width() != cr.width() ||
+         unknownField->height() != cr.height() ) {
+        delete unknownField;
         unknownField = new QPixmap( cr.width(), cr.height() );
@@ -199,6 +204,8 @@ void Mine::paint( QPainter* p, const QColorGroup &cg, const QRect& cr )
         QBrush br( cg.button() );
-        qDrawWinButton( &pp, cr, cg, FALSE, &br );
+        qDrawWinButton( &pp, QRect( 0, 0, cr.width(), cr.height() ), cg, FALSE, &br );
     }
 
-    if ( !flag_pix ) {
+    if ( !flag_pix || flag_pix->width() != cr.width()-pmmarg*2 ||
+         flag_pix->height() != cr.height()-pmmarg*2 ) {
+        delete flag_pix;
         flag_pix = new QPixmap( cr.width()-pmmarg*2, cr.height()-pmmarg*2 );
@@ -207,3 +214,5 @@ void Mine::paint( QPainter* p, const QColorGroup &cg, const QRect& cr )
 
-    if ( !mine_pix ) {
+    if ( !mine_pix || mine_pix->width() != cr.width()-pmmarg*2 ||
+         mine_pix->height() != cr.height()-pmmarg*2 ) {
+        delete mine_pix;
         mine_pix = new QPixmap( cr.width()-pmmarg*2, cr.height()-pmmarg*2 );
@@ -285,2 +294,3 @@ MineField::MineField( QWidget* parent, const char* name )
 {
+    viewport()->setBackgroundMode( NoBackground );
     setState( GameOver );
@@ -301,3 +311,5 @@ MineField::MineField( QWidget* parent, const char* name )
     cellSize = -1;
-    mines = 0;
+
+    numRows = numCols = 0;
+    mines = NULL;
 }
@@ -306,12 +318,6 @@ MineField::~MineField()
 {
-    int i;
-    if ( mines )
-    {
-        for ( i = 0; i < numCols*numRows; i++ )
-        {
+    for ( int i = 0; i < numCols*numRows; i++ )
             delete mines[i];
-        }
         delete[] mines;
     }
-}
 
@@ -329,10 +335,5 @@ void MineField::setup( int level )
     int i;
-    if ( mines )
-    {
         for ( i = 0; i < numCols*numRows; i++ )
-        {
             delete mines[i];
-        }
         delete[] mines;
-    }
 
@@ -345,5 +346,5 @@ void MineField::setup( int level )
     case 2:
-        numRows = 16;
-        numCols = 16;
-        minecount = 45;
+        numRows = 13;
+        numCols = 13;
+        minecount = 33;
         break;
@@ -399,3 +400,7 @@ void MineField::setAvailableRect( const QRect &r )
     int newCellSize = findCellSize();
-    if ( newCellSize != cellSize ) {
+
+
+    if ( newCellSize == cellSize ) {
+        setCellSize( cellSize );
+    } else {
         viewport()->setUpdatesEnabled( FALSE );
@@ -409,4 +414,4 @@ int MineField::findCellSize()
 {
-    int w = availableRect.width() - 1;
-    int h = availableRect.height() - 1;
+    int w = availableRect.width() - 2;
+    int h = availableRect.height() - 2;
     int cellsize;
@@ -421,6 +426,3 @@ void MineField::setCellSize( int cellsize )
 {
-    cellSize = cellsize;
-
-    int w = availableRect.width();
-    int h = availableRect.height();
+    int b = 2;
 
@@ -429,9 +431,20 @@ void MineField::setCellSize( int cellsize )
 
+    int w = QMIN( availableRect.width(), w2+b );
+    int h = QMIN( availableRect.height(), h2+b );
+
+    //
+    // Don't rely on the change in cellsize to force a resize,
+    // as it's possible to have the same size cells when going
+    // from a large play area to a small one.
+    //
     resizeContents( w2, h2 );
 
-    int b = 5;
+    if ( availableRect.height() < h2 &&
+         availableRect.width() - w > style().scrollBarExtent().width() ) {
+        w += style().scrollBarExtent().width();
+    }
 
-    setGeometry( availableRect.x() + (w-w2)/2, availableRect.y() + (h-h2)/2,
-                 w2+b, h2+b );
-        //       QMIN(w,w2+b), QMIN(h,h2+b) );
+    setGeometry( availableRect.x() + (availableRect.width()-w)/2,
+            availableRect.y() + (availableRect.height()-h)/2, w, h );
+    cellSize = cellsize;
 }
@@ -615,2 +628,3 @@ void MineField::updateMine( int row, int col )
         if ( m->state() == Mine::Flagged ) {
+            if (mineguess > 0) {
             --mineguess;
@@ -619,2 +633,5 @@ void MineField::updateMine( int row, int col )
                 --minecount;
+            } else {
+                m->setState(Mine::Hidden);
+            }
         } else if ( wasFlagged ) {
@@ -683,2 +700,3 @@ void MineField::readConfig(Config& cfg)
     QString grid = cfg.readEntry("Grid");
+    int x;
     if ( !grid.isEmpty() ) {
@@ -687,3 +705,3 @@ void MineField::readConfig(Config& cfg)
         mineguess=0;
-        for ( int x = 0; x < numCols; x++ ) {
+        for ( x = 0; x < numCols; x++ ) {
             for ( int y = 0; y < numRows; y++ ) {
@@ -713,3 +731,3 @@ void MineField::readConfig(Config& cfg)
         }
-        for ( int x = 0; x < numCols; x++ ) {
+        for ( x = 0; x < numCols; x++ ) {
             for ( int y = 0; y < numRows; y++ ) {
@@ -725 +743,9 @@ void MineField::readConfig(Config& cfg)
 
+QSize MineField::sizeHint() const
+{
+    if ( qApp->desktop()->width() >= 240 )
+        return QSize(200,200);
+    else
+        return QSize(160, 160);
+}
+