Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change definition of movement during drag to include not just drag of

Browse source 
a tile but motion on the board which will include crosshairs.  This
prevents miniwindow from coming up and stopping crosshairs movement
when it happened to start on a bonus square.
This commit is contained in:
Andy2 2010-07-16 18:57:08 -07:00
parent e4feef9bbc
commit dbed23e240
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/common/boardp.h
View file

@ -58,11 +58,12 @@ typedef struct _DragState {
DragType dtype;
XP_Bool didMove; /* there was change during the drag; not a
tap */
XP_Bool cellChanged; /* nothing dragged but movement happened */
XP_Bool scrollTimerSet;
XP_Bool isBlank; /* cache rather than lookup in model */
Tile tile; /* cache rather than lookup in model */
DragObjInfo start;
DragObjInfo cur;
DragObjInfo cur; /* where dragged object (not pen) is */
#ifdef XWFEATURE_RAISETILE
XP_U16 yyAdd;
#endif

21
xwords4/common/dragdrpp.c
View file

@ -63,7 +63,16 @@ dragDropInProgress( const BoardCtxt* board )
XP_Bool
dragDropHasMoved( const BoardCtxt* board )
{
return dragDropInProgress(board) && board->dragState.didMove;
XP_Bool moved = dragDropInProgress( board );
if ( moved ) {
if ( board->dragState.didMove ) {
/* something was dragged; do nothing */
} else {
const DragState* ds = &board->dragState;
moved = ds->cellChanged; /* did non-drag movement happen? */
}
}
return moved;
} /* dragDropHasMoved */
static XP_Bool
@ -490,14 +499,20 @@ dragDropContinueImpl( BoardCtxt* board, XP_U16 xx, XP_U16 yy,
} else if ( ds->dtype == DT_BOARD ) {
if ( newInfo.obj == OBJ_BOARD ) {
XP_S16 diff = newInfo.u.board.col - ds->cur.u.board.col;
if ( !ds->cellChanged && 0 != diff ) {
ds->cellChanged = XP_TRUE;
}
diff /= SCROLL_DRAG_THRESHHOLD;
moving = adjustXOffset( board, diff );
diff = newInfo.u.board.row - ds->cur.u.board.row;
if ( !ds->cellChanged && 0 != diff ) {
ds->cellChanged = XP_TRUE;
}
diff /= SCROLL_DRAG_THRESHHOLD;
moving = adjustYOffset( board, diff ) || moving;
}
} else {
} else if ( ds->dtype == DT_TILE ) {
if ( newInfo.obj == OBJ_BOARD ) {
moving = (newInfo.u.board.col != ds->cur.u.board.col)
|| (newInfo.u.board.row != ds->cur.u.board.row)
@ -537,6 +552,8 @@ dragDropContinueImpl( BoardCtxt* board, XP_U16 xx, XP_U16 yy,
XP_MEMCPY( &ds->cur, &newInfo, sizeof(ds->cur) );
startScrollTimerIf( board );
}
} else {
XP_ASSERT( 0 );
}
if ( moving ) {