1 files changed, 25 insertions, 10 deletions

diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 6492462..c84fe53 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -216,32 +216,48 @@ void ResultIndicator::timerEvent( QTimerEvent *te )
     } else {
         delete this;
     }
 }
 
 
+class MineFrame : public QFrame
+{
+public:
+    MineFrame( QWidget *parent, const char *name = 0 )
+        :QFrame( parent, name ) {}
+    void setField( MineField *f ) { field = f; }
+protected:
+    void resizeEvent( QResizeEvent *e ) {
+        field->setAvailableRect( contentsRect());
+        QFrame::resizeEvent(e); 
+    }
+private:
+    MineField *field;
+};
+
+
+
 MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
 : QMainWindow( parent, name, f )
 {
     srand(::time(0));
     setCaption( tr("Mine Hunt") );
     setIcon( Resource::loadPixmap( "minesweep_icon" ) );
 
-    QPEToolBar *menuToolBar = new QPEToolBar( this );
-    QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar );
+    QPEToolBar *toolBar = new QPEToolBar( this );
+    toolBar->setHorizontalStretchable( TRUE );
+
+    QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
 
     QPopupMenu *gameMenu = new QPopupMenu( this );
     gameMenu->insertItem( tr("Beginner"), this, SLOT( beginner() ) );
     gameMenu->insertItem( tr("Advanced"), this, SLOT( advanced() ) );
     gameMenu->insertItem( tr("Expert"), this, SLOT( expert() ) );
 
     menuBar->insertItem( tr("Game"), gameMenu );
 
-    QPEToolBar *toolBar = new QPEToolBar( this );
-    toolBar->setHorizontalStretchable( TRUE );
-    
     guessLCD = new QLCDNumber( toolBar );
     toolBar->setStretchableWidget( guessLCD );
 
     QPalette lcdPal( red );
     lcdPal.setColor( QColorGroup::Background, QApplication::palette().active().background() );
     lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() );
@@ -262,23 +278,22 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     timeLCD->setFrameStyle( QFrame::NoFrame );
     timeLCD->setNumDigits( 5 ); // "mm:ss"
     timeLCD->setBackgroundMode( PaletteButton );
     
     setToolBarsMovable ( FALSE );
 
-    addToolBar( menuToolBar );
     addToolBar( toolBar );
 
-    QFrame *mainframe = new QFrame( this );
+    MineFrame *mainframe = new MineFrame( this );
     mainframe->setFrameShape( QFrame::Box );
     mainframe->setFrameShadow( QFrame::Raised );
-    mainframe->setMargin(5);
+
     mainframe->setLineWidth(2);
-    QBoxLayout *box = new QVBoxLayout( mainframe );
+
     field = new MineField( mainframe );
-    box->addWidget( field, 0, AlignCenter );
+    mainframe->setField( field );
     QFont fnt = field->font();
     fnt.setBold( TRUE );
     field->setFont( QFont( fnt ) );
     field->setFocus();
     setCentralWidget( mainframe );