From: Ian Jackson Date: Sat, 30 Sep 2017 00:26:01 +0000 (+0100) Subject: Revert "RFH: tracks: Grid line width problems" X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=7ccaba8df597fc32e50e2c821438e0258dc65423;p=sgt-puzzles.git Revert "RFH: tracks: Grid line width problems" This reverts commit 8949d7312a84ad4d2d7df59be9bad27d747acd2a. --- diff --git a/tracks.c b/tracks.c index d9c50d8..4d5e7ca 100644 --- a/tracks.c +++ b/tracks.c @@ -1718,7 +1718,7 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate, #define TILE_SIZE (ds->sz6*6) #define BORDER (TILE_SIZE/8) -#define BORDER_WIDTH (TILE_SIZE/8) +#define BORDER_WIDTH (max(TILE_SIZE / 32, 1)) #define LINE_THICK (TILE_SIZE/16) #define COORD(x) ( (x+1) * TILE_SIZE + BORDER ) @@ -2353,8 +2353,8 @@ static void draw_square(drawing *dr, game_drawstate *ds, draw_rect(dr, ox, oy, TILE_SIZE, TILE_SIZE, bg); /* Draw outline of grid square */ - draw_thick_line(dr, BORDER_WIDTH, ox, oy, COORD(x+1), oy, COL_GRID); - draw_thick_line(dr, BORDER_WIDTH, ox, oy, ox, COORD(y+1), COL_GRID); + draw_line(dr, ox, oy, COORD(x+1), oy, COL_GRID); + draw_line(dr, ox, oy, ox, COORD(y+1), COL_GRID); /* More outlines for clue squares. */ if (flags & DS_CURSOR) { @@ -2499,8 +2499,8 @@ static void game_redraw(drawing *dr, game_drawstate *ds, const game_state *oldst draw_loop_ends(dr, ds, state, COL_CLUE); - draw_thick_line(dr, BORDER_WIDTH, COORD(ds->w), COORD(0), COORD(ds->w), COORD(ds->h), COL_GRID); - draw_thick_line(dr, BORDER_WIDTH, COORD(0), COORD(ds->h), COORD(ds->w), COORD(ds->h), COL_GRID); + draw_line(dr, COORD(ds->w), COORD(0), COORD(ds->w), COORD(ds->h), COL_GRID); + draw_line(dr, COORD(0), COORD(ds->h), COORD(ds->w), COORD(ds->h), COL_GRID); draw_update(dr, 0, 0, (w+2)*TILE_SIZE + 2*BORDER, (h+2)*TILE_SIZE + 2*BORDER);