Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

up version number; test for CELL_DRAGSRC and treat same as empty.

Browse source
This commit is contained in:
ehouse 2008-04-01 13:00:10 +00:00
parent 0225343c09
commit 11b0b4d254
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
xwords4/palm/palmdraw.c
View file

@ -331,13 +331,15 @@ palm_clr_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
IndexedColorType color;
XP_U16 index;
XP_Bool isCursor = TREAT_AS_CURSOR( dctx, flags );
XP_Bool isPending = (flags & CELL_HIGHLIGHT) != 0;
XP_Bool isPending = ((flags & CELL_HIGHLIGHT) != 0);
XP_Bool dragSrc = ((flags & CELL_DRAGSRC) != 0);
if ( isCursor ) {
index = COLOR_CURSOR;
} else if ( isPending ) {
} else if ( isPending && !dragSrc ) {
/* don't color background if will invert */
index = COLOR_WHITE;
} else if ( !!bitmap || (!!letters && XP_STRLEN((const char*)letters) > 0)){
} else if ( (!!bitmap || !!letters) && !dragSrc ) {
index = COLOR_TILE;
} else if ( bonus == BONUS_NONE ) {
index = COLOR_EMPTY;
@ -458,7 +460,7 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
Boolean showGrid = globals->gState.showGrid;
Boolean showBonus = bonus != BONUS_NONE;
Boolean complete;
XP_Bool empty = XP_TRUE;
XP_Bool showEmpty = 0 != (flags & (CELL_ISEMPTY|CELL_DRAGSRC));
if ( showGrid ) {
++localR.width;
@ -494,7 +496,9 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
eraseRect( &localR );
if ( !!letters ) {
if ( showEmpty ) {
/* do nothing */
} else if ( !!letters ) {
len = XP_STRLEN( (const char*)letters );
XP_ASSERT( len > 0 );
if ( len > 0 ) {
@ -513,7 +517,6 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
WinDrawChars( (const char*)letters, len, x, y );
showBonus = XP_FALSE;
empty = XP_FALSE;
}
} else if ( !!bitmap ) {
XP_Bool doColor = (able == COLOR) && (owner >= 0);
@ -537,11 +540,9 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
WinSetForeColor( dctx->drawingPrefs->drawColors[COLOR_BLACK] );
}
showBonus = doColor; /* skip bonus in B&W case; can't draw both! */
empty = XP_FALSE;
}
if ( ((flags & CELL_ISSTAR) != 0)
&& ((flags & (CELL_DRAGSRC | CELL_ISEMPTY)) != 0 ) ) {
if ( ((flags & CELL_ISSTAR) != 0) && showEmpty ) {
bitmapInRect( dctx, STAR_BMP_RES_ID, rect );
} else if ( showBonus && (able == ONEBIT) ) {
/* this is my one refusal to totally factor bandw and color
@ -549,7 +550,7 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
WinSetPattern( (const CustomPatternType*)
&dctx->u.bnw.valuePatterns[bonus-1] );
WinFillRectangle( (RectangleType*)&localR, 0 );
} else if ( !showBonus && empty && !showGrid ) {
} else if ( !showBonus && showEmpty && !showGrid ) {
/* should this be in the v-table so I don't have to test each
time? */
RectangleType r;
@ -569,7 +570,7 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
}
}
if ( (flags & CELL_HIGHLIGHT) != 0 ) {
if ( !showEmpty && (flags & CELL_HIGHLIGHT) != 0 ) {
if ( !TREAT_AS_CURSOR( dctx, flags ) ) {
XP_ASSERT( !!bitmap ||
(!!letters && XP_STRLEN((const char*)letters)>0));
@ -581,7 +582,7 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
WinDrawRectangleFrame(rectangleFrame, (RectangleType*)&localR);
}
if ( (flags & CELL_ISBLANK) != 0 ) {
if ( ((flags & CELL_ISBLANK) != 0) && !showEmpty ) {
WinEraseRectangleFrame( roundFrame, (RectangleType*)&localR );
}

2
xwords4/palm/xwords4defines.h
View file

@ -439,7 +439,7 @@
/* versioning stuff */
#ifdef XWFEATURE_BLUETOOTH
# define XW_PALM_VERSION_STRING "4.3b5"
# define XW_PALM_VERSION_STRING "4.3b6"
#else
/* There's a separate branch for 2.4 releases now. */
# define XW_PALM_VERSION_STRING "4.2.1"