mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-22 07:28:16 +01:00
include dict name with game above scoreboard
This commit is contained in:
parent
8a46a9f524
commit
50d9bfe455
1 changed files with 18 additions and 18 deletions
|
@ -545,12 +545,12 @@ CXWordsAppView::PositionBoard()
|
||||||
board_setScale( iGame.board, scaleBoardH, scaleBoardV );
|
board_setScale( iGame.board, scaleBoardH, scaleBoardV );
|
||||||
|
|
||||||
TInt scoreLeft = 2 + (15 * scaleBoardH) + 5;
|
TInt scoreLeft = 2 + (15 * scaleBoardH) + 5;
|
||||||
board_setScoreboardLoc( iGame.board, scoreLeft, 25,
|
board_setScoreboardLoc( iGame.board, scoreLeft, 30,
|
||||||
200, 125, XP_FALSE );
|
200, 120, XP_FALSE );
|
||||||
board_setYOffset( iGame.board, 0, XP_FALSE );
|
board_setYOffset( iGame.board, 0, XP_FALSE );
|
||||||
|
|
||||||
board_setTrayLoc( iGame.board,
|
board_setTrayLoc( iGame.board,
|
||||||
(15 * scaleBoardH) + 5, // to right of board
|
2 + (15 * scaleBoardH) + 5, // to right of board
|
||||||
// make tray bottom same as board's
|
// make tray bottom same as board's
|
||||||
2 + (15*scaleBoardV) - scaleTrayV,
|
2 + (15*scaleBoardV) - scaleTrayV,
|
||||||
scaleTrayH, scaleTrayV, // v and h scale
|
scaleTrayH, scaleTrayV, // v and h scale
|
||||||
|
@ -587,7 +587,7 @@ CXWordsAppView::HandleCommand( TInt aCommand )
|
||||||
if ( iGame.server != NULL ) {
|
if ( iGame.server != NULL ) {
|
||||||
XWStreamCtxt* stream = MakeSimpleStream( NULL );
|
XWStreamCtxt* stream = MakeSimpleStream( NULL );
|
||||||
if ( stream != NULL ) {
|
if ( stream != NULL ) {
|
||||||
server_formatDictCounts( iGame.server, stream, 4 ); /* 4: ncols */
|
server_formatDictCounts( iGame.server, stream, 7 ); /* 4: ncols */
|
||||||
CXWAskDlg::DoInfoDlg(MPPARM(mpool) stream, ETrue);
|
CXWAskDlg::DoInfoDlg(MPPARM(mpool) stream, ETrue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1083,20 +1083,20 @@ CXWordsAppView::DoImmediateDraw()
|
||||||
void
|
void
|
||||||
CXWordsAppView::DrawGameName() const
|
CXWordsAppView::DrawGameName() const
|
||||||
{
|
{
|
||||||
|
if ( iGi.dictName != NULL ) {
|
||||||
|
TBuf16<66> buf;
|
||||||
|
buf.Copy( TBuf8<32>(iGi.dictName) );
|
||||||
|
buf.Insert( 0, _L("::") );
|
||||||
|
buf.Insert( 0, iCurGameName );
|
||||||
|
|
||||||
CWindowGc& gc = SystemGc();
|
CWindowGc& gc = SystemGc();
|
||||||
|
|
||||||
gc.UseFont( iCoeEnv->NormalFont() );
|
|
||||||
|
|
||||||
TBuf16<48> buf( _L( "Game: " ) );
|
|
||||||
buf.Append( iCurGameName );
|
|
||||||
/* gc.DrawText( buf, iGameNameLoc ); */
|
|
||||||
|
|
||||||
gc.SetPenStyle( CGraphicsContext::ESolidPen );
|
gc.SetPenStyle( CGraphicsContext::ESolidPen );
|
||||||
gc.SetPenColor( KRgbBlack );
|
gc.SetPenColor( KRgbBlack );
|
||||||
gc.SetBrushStyle( CGraphicsContext::ENullBrush );
|
gc.SetBrushStyle( CGraphicsContext::ENullBrush );
|
||||||
|
|
||||||
gc.DrawText( buf, iTitleBox, iTitleBox.Height() - 2,/*TInt aBaselineOffset*/
|
gc.UseFont( iCoeEnv->NormalFont() );
|
||||||
|
gc.DrawText( buf, iTitleBox, iTitleBox.Height() - 4,/*TInt aBaselineOffset*/
|
||||||
CGraphicsContext::ECenter );
|
CGraphicsContext::ECenter );
|
||||||
|
|
||||||
gc.DiscardFont();
|
gc.DiscardFont();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue