From 206b56a50ae5edcb28cd770bc6f123dcf452da57 Mon Sep 17 00:00:00 2001 From: ehouse Date: Mon, 1 Dec 2008 13:06:37 +0000 Subject: [PATCH] Don't draw hint rect, or start drag to change it, if hints are disallowed. --- common/boarddrw.c | 4 +++- common/dragdrpp.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/boarddrw.c b/common/boarddrw.c index 5a8ab4114..4f9da3b0d 100644 --- a/common/boarddrw.c +++ b/common/boarddrw.c @@ -168,7 +168,9 @@ figureHintAtts( BoardCtxt* board, XP_U16 col, XP_U16 row ) HintAtts result = HINT_BORDER_NONE; /* while lets us break to exit... */ - while ( board->trayVisState == TRAY_REVEALED && board->gi->allowHintRect ) { + while ( board->trayVisState == TRAY_REVEALED + && !board->gi->hintsNotAllowed + && board->gi->allowHintRect ) { BdHintLimits limits; if ( dragDropGetHintLimits( board, &limits ) ) { /* do nothing */ diff --git a/common/dragdrpp.c b/common/dragdrpp.c index fb2f4cacb..862ea58b1 100644 --- a/common/dragdrpp.c +++ b/common/dragdrpp.c @@ -87,7 +87,8 @@ ddStartBoard( BoardCtxt* board, XP_U16 xx, XP_U16 yy ) XP_Bool canScroll = board->lastVisibleRow < model_numRows(board->model); if ( 0 ) { #ifdef XWFEATURE_SEARCHLIMIT - } else if ( board->gi->allowHintRect && trayVisible ) { + } else if ( !board->gi->hintsNotAllowed && board->gi->allowHintRect + && trayVisible ) { if ( !util_altKeyDown(board->util) ) { ds->dtype = DT_HINTRGN; } else if ( canScroll ) {