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

GTK 3 port: stop getting default bg colour from the window style.

Browse Source 
GTK3 window styles don't reliably provide one, so we have to fall back
to just making one up.
This commit is contained in:
Simon Tatham
2015-10-03 12:28:15 +01:00
parent 4e1cc65701
commit d6210656b8
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk.c
View File

@ -186,10 +186,26 @@ void get_random_seed(void **randseed, int *randseedsize)
void frontend_default_colour(frontend *fe, float *output) void frontend_default_colour(frontend *fe, float *output)
{ {
#if !GTK_CHECK_VERSION(3,0,0)
/*
* Use the widget style's default background colour as the
* background for the puzzle drawing area.
*/
GdkColor col = gtk_widget_get_style(fe->window)->bg[GTK_STATE_NORMAL]; GdkColor col = gtk_widget_get_style(fe->window)->bg[GTK_STATE_NORMAL];
output[0] = col.red / 65535.0; output[0] = col.red / 65535.0;
output[1] = col.green / 65535.0; output[1] = col.green / 65535.0;
output[2] = col.blue / 65535.0; output[2] = col.blue / 65535.0;
#else
/*
* GTK 3 has decided that there's no such thing as a 'default
* background colour' any more, because widget styles might set
* the background to something more complicated like a background
* image. We don't want to get into overlaying our entire puzzle
* on an arbitrary background image, so we'll just make up a
* reasonable shade of grey.
*/
output[0] = output[1] = output[2] = 0.9F;
#endif
} }
void gtk_status_bar(void *handle, char *text) void gtk_status_bar(void *handle, char *text)