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

Pattern: Pack clues for each row more closely together

Browse Source 
Rather than centring each clue in an imaginary box, put equal amounts of
space between them (using space characters) and then right-align the
whole string.  This makes for more efficient use of space, and I think
it also looks better when there are two-digit clues.

This does introduce a rather grotty (if large) fixed-size buffer for row
clues.  Probably the row clues should be pre-formatted into a string
when the puzzle is set up.
This commit is contained in:
Ben Harris
2022-12-29 00:35:02 +00:00
parent 23c9e0a8b2
commit 1ef9aa4cc2
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pattern.c
View File

@ -1790,23 +1790,31 @@ static void draw_numbers(
nfit = max(rowlen, nfit) - 1; nfit = max(rowlen, nfit) - 1;
assert(nfit > 0); assert(nfit > 0);
for (j = 0; j < rowlen; j++) { if (i < state->common->w) {
int x, y; for (j = 0; j < rowlen; j++) {
char str[80]; int x, y;
char str[80];
if (i < state->common->w) {
x = rx; x = rx;
y = BORDER + TILE_SIZE * (TLBORDER(state->common->h)-1); y = BORDER + TILE_SIZE * (TLBORDER(state->common->h)-1);
y -= ((rowlen-j-1)*TILE_SIZE) * (TLBORDER(state->common->h)-1) / nfit; y -= ((rowlen-j-1)*TILE_SIZE) * (TLBORDER(state->common->h)-1) / nfit;
} else { sprintf(str, "%d", rowdata[j]);
y = ry; draw_text(dr, x+TILE_SIZE/2, y+TILE_SIZE/2, FONT_VARIABLE,
x = BORDER + TILE_SIZE * (TLBORDER(state->common->w)-1); TILE_SIZE/2, ALIGN_HCENTRE | ALIGN_VCENTRE, colour, str);
x -= ((rowlen-j-1)*TILE_SIZE) * (TLBORDER(state->common->w)-1) / nfit;
} }
} else {
int x, y;
char str[280];
size_t off = 0;
sprintf(str, "%d", rowdata[j]); for (j = 0; j < rowlen; j++) {
draw_text(dr, x+TILE_SIZE/2, y+TILE_SIZE/2, FONT_VARIABLE, assert(off < 260);
TILE_SIZE/2, ALIGN_HCENTRE | ALIGN_VCENTRE, colour, str); off += sprintf(str + off, "%s%d", j ? " " : "", rowdata[j]);
}
y = ry;
x = BORDER + TILE_SIZE * (TLBORDER(state->common->w)-1);
draw_text(dr, x+TILE_SIZE, y+TILE_SIZE/2, FONT_VARIABLE,
TILE_SIZE/2, ALIGN_HRIGHT | ALIGN_VCENTRE, colour, str);
} }
unclip(dr); unclip(dr);