From 57013a9267a72e0479eea9829d3b5bc6e04b830e Mon Sep 17 00:00:00 2001 From: eehouse Date: Fri, 4 Jun 2010 03:47:46 +0000 Subject: [PATCH] stop dragging before putting up miniwindow. This allows to drag finger off of bonus hint just displayed without scrolling the screen. --- xwords4/common/board.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xwords4/common/board.c b/xwords4/common/board.c index 2fb6a5e0d..9afb4a5d4 100644 --- a/xwords4/common/board.c +++ b/xwords4/common/board.c @@ -892,6 +892,7 @@ timerFiredForPen( BoardCtxt* board ) } } board->penTimerFired = XP_TRUE; + /* stop any dragging here */ } } else if ( board->penDownObject == OBJ_SCORE ) { LocalPlayer* lp; @@ -926,11 +927,14 @@ timerFiredForPen( BoardCtxt* board ) } if ( !!text ) { + XP_Bool dragged; MiniWindowStuff* stuff = &board->miniWindowStuff[MINIWINDOW_VALHINT]; makeMiniWindowForText( board, text, MINIWINDOW_VALHINT ); XP_ASSERT( stuff->text == text ); draw_drawMiniWindow(board->draw, text, &stuff->rect, &stuff->closure); + dragDropEnd( board, board->penDownX, board->penDownY, &dragged ); + XP_ASSERT( !dragged ); } return draw; } /* timerFiredForPen */