zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Small UI bug: LEFT_RELEASEs were being thrown away completely if

Browse Source 
their coordinates were outside the playing area. Clearly no actual
move should be made in that situation, but we do at least need to
sort out any highlighted squares from the prior dragging operations.

[originally from svn r5911]
This commit is contained in:
Simon Tatham
2005-06-04 17:51:49 +00:00
parent 852bddabbb
commit 57b3982c83
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mines.c
View File

@ -2490,11 +2490,12 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
cx = FROMCOORD(x);
cy = FROMCOORD(y);
if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
return NULL;
if (button == LEFT_BUTTON || button == LEFT_DRAG ||
button == MIDDLE_BUTTON || button == MIDDLE_DRAG) {
if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
return NULL;
/*
* Mouse-downs and mouse-drags just cause highlighting
* updates.
@ -2506,6 +2507,9 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
}
if (button == RIGHT_BUTTON) {
if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
return NULL;
/*
* Right-clicking only works on a covered square, and it
* toggles between -1 (marked as mine) and -2 (not marked
@ -2532,6 +2536,8 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
* At this stage we must never return NULL: we have adjusted
* the ui, so at worst we return `from'.
*/
if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
return from;
/*
* Left-clicking on a covered square opens a tile. Not