mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-04 23:02:02 +01:00
minor fixes to drawing spacing (what I meant to check in)
This commit is contained in:
parent
6c8d4c663f
commit
a1b0a11baa
1 changed files with 4 additions and 4 deletions
|
@ -115,9 +115,10 @@ measureText( CEDrawCtx* dctx, const XP_UCHAR* str,
|
||||||
XP_U16* widthP, XP_U16* heightP )
|
XP_U16* widthP, XP_U16* heightP )
|
||||||
{
|
{
|
||||||
HDC hdc = GetDC(dctx->mainWin);//globals->hdc;
|
HDC hdc = GetDC(dctx->mainWin);//globals->hdc;
|
||||||
XP_U16 height, maxWidth;
|
XP_U16 height = 0;
|
||||||
|
XP_U16 maxWidth = 0;
|
||||||
|
|
||||||
for ( height = 0, maxWidth = 0; ; ) {
|
for ( ; ; ) {
|
||||||
wchar_t widebuf[64];
|
wchar_t widebuf[64];
|
||||||
XP_UCHAR* nextStr = strstr( str, XP_CR );
|
XP_UCHAR* nextStr = strstr( str, XP_CR );
|
||||||
XP_U16 len = nextStr==NULL? strlen(str): nextStr - str;
|
XP_U16 len = nextStr==NULL? strlen(str): nextStr - str;
|
||||||
|
@ -141,7 +142,7 @@ measureText( CEDrawCtx* dctx, const XP_UCHAR* str,
|
||||||
str = nextStr + XP_STRLEN(XP_CR); /* skip '\n' */
|
str = nextStr + XP_STRLEN(XP_CR); /* skip '\n' */
|
||||||
}
|
}
|
||||||
|
|
||||||
*widthP = maxWidth;// + 8;
|
*widthP = maxWidth + 8;
|
||||||
*heightP = height;
|
*heightP = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -602,7 +603,6 @@ DRAW_FUNC_NAME(measureRemText)( DrawCtx* p_dctx, const XP_Rect* r,
|
||||||
|
|
||||||
formatRemText( hdc, nTilesLeft, dctx->scoreIsVertical, buf );
|
formatRemText( hdc, nTilesLeft, dctx->scoreIsVertical, buf );
|
||||||
measureText( dctx, buf, width, height );
|
measureText( dctx, buf, width, height );
|
||||||
XP_LOGF( "width(Rem) = %d", *width );
|
|
||||||
} /* ce_draw_measureRemText */
|
} /* ce_draw_measureRemText */
|
||||||
|
|
||||||
DLSTATIC void
|
DLSTATIC void
|
||||||
|
|
Loading…
Reference in a new issue