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

Set clip rect before scrolling screen. Fixes bug where scroll forced

Browse source 
by hint left board drawn incorrectly.
This commit is contained in:
ehouse 2008-04-12 19:29:20 +00:00
parent 4730a23188
commit 18ea57fa38
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xwords4/wince/cedraw.c
View file

@ -124,7 +124,7 @@ GetTextExtentPoint32W( HDC hdc, LPCWSTR str, int i, LPSIZE siz )
#endif
static void
ceClipToRect( CEDrawCtx* dctx, HDC hdc, const RECT* rt )
ceClipToRect( /* CEDrawCtx* dctx, */HDC hdc, const RECT* rt )
{
/*
NULLREGION Region is empty.
@ -336,14 +336,14 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
XPRtoRECT( &rt, xprect );
++rt.bottom;
++rt.right;
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
Rectangle( hdc, rt.left, rt.top, rt.right, rt.bottom );
textRect = rt;
InsetRect( &textRect, 1, 1 );
InsetRect( &rt, 1, 1 );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
/* always init to silence compiler warning */
foreColorRef = dctx->globals->appPrefs.colors[getPlayerColor(owner)];
@ -472,7 +472,7 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
XP_Bool isEmpty = (flags & CELL_ISEMPTY) != 0;
XPRtoRECT( &rt, xprect );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
ceClearToBkground( dctx, xprect );
if ( !isEmpty || isFocussed ) {
@ -483,7 +483,7 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
InsetRect( &rt, 1, 1 );
Rectangle(hdc, rt.left, rt.top, rt.right, rt.bottom);
InsetRect( &rt, 1, 1 );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
if ( !isEmpty ) {
index = getPlayerColor(dctx->trayOwner);
@ -576,7 +576,7 @@ DRAW_FUNC_NAME(drawTrayDivider)( DrawCtx* p_dctx, const XP_Rect* rect,
RECT rt;
XPRtoRECT( &rt, rect );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
if ( selected ) {
Rectangle( hdc, rt.left, rt.top, rt.right, rt.bottom );
} else {
@ -641,7 +641,7 @@ DRAW_FUNC_NAME(drawBoardArrow)( DrawCtx* p_dctx, const XP_Rect* xprect,
++rt.bottom;
++rt.right;
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
Rectangle( hdc, rt.left, rt.top, rt.right, rt.bottom );
InsetRect( &rt, 1, 1 );
@ -727,7 +727,7 @@ DRAW_FUNC_NAME(drawRemText)( DrawCtx* p_dctx, const XP_Rect* rInner,
formatRemText( nTilesLeft, dctx->scoreIsVertical, buf );
XPRtoRECT( &rt, rInner );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
++rt.left; /* 1: don't write up against edge */
drawLines( dctx, hdc, buf, CE_REM_PADDING, &rt,
DT_SINGLELINE | DT_LEFT | DT_VCENTER | DT_CENTER );
@ -827,7 +827,7 @@ DRAW_FUNC_NAME(score_drawPlayer)( DrawCtx* p_dctx,
SetBkColor( hdc, dctx->globals->appPrefs.colors[bkIndex] );
XPRtoRECT( &rt, rOuter );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
if ( isFocussed ) {
FillRect( hdc, &rt, dctx->brushes[CE_FOCUS_COLOR] );
}
@ -875,7 +875,7 @@ DRAW_FUNC_NAME(score_pendingScore)( DrawCtx* p_dctx, const XP_Rect* rect,
XPRtoRECT( &rt, rect );
FillRect( hdc, &rt, dctx->brushes[bkIndex] );
ceClipToRect( dctx, hdc, &rt );
ceClipToRect( hdc, &rt );
if ( score < 0 ) {
buf[0] = '?';
@ -1058,8 +1058,12 @@ DRAW_FUNC_NAME(vertScrollBoard)( DrawCtx* p_dctx, XP_Rect* rect,
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
CEAppGlobals* globals = dctx->globals;
int destY, srcY;
RECT rt;
XP_Bool down = dist <= 0;
XPRtoRECT( &rt, rect );
ceClipToRect( globals->hdc, &rt );
if ( down ) {
srcY = rect->top;
dist = -dist; /* make it positive */