Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-17 18:12:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

move scoreboard down and draw open game's name above it

Browse source
This commit is contained in:
ehouse 2005-01-21 07:58:34 +00:00
parent cb92bd491d
commit 61f14ddd0e
1 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
xwords4/symbian/src/xwappview.cpp
View file

@ -45,6 +45,7 @@
#include "symgamdl.h" #include "symgamdl.h"
#include "symblnk.h" #include "symblnk.h"
#include "symgmdlg.h" #include "symgmdlg.h"
#include "symutil.h"
#include "LocalizedStrIncludes.h" #include "LocalizedStrIncludes.h"
@ -69,6 +70,8 @@ CXWordsAppView::CXWordsAppView()
// no implementation required // no implementation required
iDraw = NULL; iDraw = NULL;
XP_MEMSET( &iGame, 0, sizeof(iGame) ); XP_MEMSET( &iGame, 0, sizeof(iGame) );
iCurGameName.Copy( _L("") );
} }
CXWordsAppView::~CXWordsAppView() CXWordsAppView::~CXWordsAppView()
@ -182,6 +185,8 @@ void CXWordsAppView::Draw( const TRect& aRect ) const
board_draw( iGame.board ); board_draw( iGame.board );
} }
DrawGameName();
} // Draw } // Draw
/* static */ VTableMgr* /* static */ VTableMgr*
@ -539,8 +544,9 @@ CXWordsAppView::PositionBoard()
board_setPos( iGame.board, 2, 2, XP_FALSE ); board_setPos( iGame.board, 2, 2, XP_FALSE );
board_setScale( iGame.board, scaleBoardH, scaleBoardV ); board_setScale( iGame.board, scaleBoardH, scaleBoardV );
board_setScoreboardLoc( iGame.board, 2 + (15 * scaleBoardH) + 5, 2, TInt scoreLeft = 2 + (15 * scaleBoardH) + 5;
200, 130, XP_FALSE ); board_setScoreboardLoc( iGame.board, scoreLeft, 25,
200, 125, XP_FALSE );
board_setYOffset( iGame.board, 0, XP_FALSE ); board_setYOffset( iGame.board, 0, XP_FALSE );
board_setTrayLoc( iGame.board, board_setTrayLoc( iGame.board,
@ -550,6 +556,10 @@ CXWordsAppView::PositionBoard()
scaleTrayH, scaleTrayV, // v and h scale scaleTrayH, scaleTrayV, // v and h scale
3 ); // divider width 3 ); // divider width
board_invalAll( iGame.board ); board_invalAll( iGame.board );
iTitleBox.SetRect( scoreLeft, 2,
scoreLeft + (scaleTrayH * MAX_TRAY_TILES) + 3,
2 + 20 );
} // PositionBoard } // PositionBoard
int int
@ -985,6 +995,7 @@ CXWordsAppView::DoSavedGames()
gi_disposePlayerInfo( MPPARM(mpool) &iGi ); gi_disposePlayerInfo( MPPARM(mpool) &iGi );
LoadOneGameL( &iCurGameName ); LoadOneGameL( &iCurGameName );
Window().Invalidate( iTitleBox );
} }
} }
return confirmed; return confirmed;
@ -1019,9 +1030,10 @@ CXWordsAppView::StoreOneGameL( TGameName* aGameName )
XWStreamCtxt* stream = MakeSimpleStream( NULL ); XWStreamCtxt* stream = MakeSimpleStream( NULL );
/* save the dict. NOTE: should be possible to do away with this! */ /* save the dict. NOTE: should be possible to do away with this! */
XP_U16 len = XP_STRLEN(iGi.dictName); XP_U32 len = XP_STRLEN(iGi.dictName);
stream_putU8( stream, len ); XP_ASSERT( len <= 0xFF );
stream_putBytes( stream, iGi.dictName, len ); stream_putU8( stream, SC(XP_U8, len) );
stream_putBytes( stream, iGi.dictName, SC(XP_U16, len) );
/* Now the game */ /* Now the game */
game_saveToStream( &iGame, &iGi, stream ); game_saveToStream( &iGame, &iGi, stream );
@ -1067,3 +1079,24 @@ CXWordsAppView::DoImmediateDraw()
DeactivateGc(); DeactivateGc();
} /* DoImmediateDraw */ } /* DoImmediateDraw */
void
CXWordsAppView::DrawGameName() const
{
CWindowGc& gc = SystemGc();
gc.UseFont( iCoeEnv->NormalFont() );
TBuf16<48> buf( _L( "Game: " ) );
buf.Append( iCurGameName );
/* gc.DrawText( buf, iGameNameLoc ); */
gc.SetPenStyle( CGraphicsContext::ESolidPen );
gc.SetPenColor( KRgbBlack );
gc.SetBrushStyle( CGraphicsContext::ENullBrush );
gc.DrawText( buf, iTitleBox, iTitleBox.Height() - 2,/*TInt aBaselineOffset*/
CGraphicsContext::ECenter );
gc.DiscardFont();
}