From 3cb919f4f7eb8a0785ace3c750a4a33987a6eb49 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Thu, 29 Dec 2022 22:28:03 +0000 Subject: [PATCH] Tracks: Set the grid colour based on others COL_GRID used to be mid-way between the usual COL_BACKGROUND and COL_TRACK_BACKGROUND. But then I changed mkhighlight() so that it didn't make COL_BACKGROUND so dark and that made the grid lines indistinguishable from the track background. Now COL_GRID is generated from COL_BACKGROUND and COL_TRACK_BACKGROUND so as long as those are sufficiently distinct from each other, COL_GRID will be distinct from both of them. --- tracks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tracks.c b/tracks.c index 2a593c6..2fad011 100644 --- a/tracks.c +++ b/tracks.c @@ -2515,12 +2515,13 @@ static float *game_colours(frontend *fe, int *ncolours) int i; game_mkhighlight(fe, ret, COL_BACKGROUND, -1, COL_TRACK_BACKGROUND); + colour_mix(&ret[COL_BACKGROUND*3], &ret[COL_TRACK_BACKGROUND*3], 0.5F, + &ret[COL_GRID*3]); for (i = 0; i < 3; i++) { ret[COL_TRACK_CLUE * 3 + i] = 0.0F; ret[COL_TRACK * 3 + i] = 0.5F; ret[COL_CLUE * 3 + i] = 0.0F; - ret[COL_GRID * 3 + i] = 0.75F; ret[COL_CURSOR * 3 + i] = 0.3F; ret[COL_ERROR_BACKGROUND * 3 + i] = 1.0F; }