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

Don't draw negative number of tiles left.

Browse source
This commit is contained in:
ehouse 2007-11-25 15:12:22 +00:00
parent 4e335550a7
commit 044a889d6d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linux/gtkdraw.c
View file

@ -707,7 +707,7 @@ gtk_draw_scoreBegin( DrawCtx* p_dctx, const XP_Rect* rect,
} /* gtk_draw_scoreBegin */ } /* gtk_draw_scoreBegin */
static void static void
gtkDrawDrawRemText( DrawCtx* p_dctx, const XP_Rect* r, XP_U16 nTilesLeft, gtkDrawDrawRemText( DrawCtx* p_dctx, const XP_Rect* r, XP_S16 nTilesLeft,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
@ -764,7 +764,7 @@ scoreWidthAndText( GtkDrawCtx* XP_UNUSED(dctx), PangoLayout* layout, char* buf,
} }
sprintf( buf, "%s%.3d", borders, score ); sprintf( buf, "%s%.3d", borders, score );
if ( nTilesLeft < MAX_TRAY_TILES ) { if ( (nTilesLeft < MAX_TRAY_TILES) && (nTilesLeft > 0) ) {
char nbuf[10]; char nbuf[10];
sprintf( nbuf, ":%d", nTilesLeft ); sprintf( nbuf, ":%d", nTilesLeft );
(void)strcat( buf, nbuf ); (void)strcat( buf, nbuf );
@ -794,7 +794,7 @@ gtk_draw_measureScoreText( DrawCtx* p_dctx, const XP_Rect* r,
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx;
char buf[20]; char buf[20];
PangoLayout* layout = layout_for_ht( dctx, r->height ); PangoLayout* layout = layout_for_ht( dctx, r->height-2 );
scoreWidthAndText( dctx, layout, buf, dsi, width, height ); scoreWidthAndText( dctx, layout, buf, dsi, width, height );
} /* gtk_draw_measureScoreText */ } /* gtk_draw_measureScoreText */