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

Stop using deprecated GTK 3 geometry-based functions.

Browse Source 
Now we work out for ourselves how the drawing-area size relates to the
overall window size, by adding on the height of fe->menubar and/or
fe->statusbar.
This commit is contained in:
Simon Tatham
2016-12-03 08:49:29 +00:00
parent 5123b1bf68
commit 8dfe5cec31
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gtk.c
View File

@ -1935,6 +1935,24 @@ static gint configure_window(GtkWidget *widget,
return FALSE; return FALSE;
} }
#if GTK_CHECK_VERSION(3,0,0)
static int window_extra_height(frontend *fe)
{
int ret = 0;
if (fe->menubar) {
GtkRequisition req;
gtk_widget_get_preferred_size(fe->menubar, &req, NULL);
ret += req.height;
}
if (fe->statusbar) {
GtkRequisition req;
gtk_widget_get_preferred_size(fe->statusbar, &req, NULL);
ret += req.height;
}
return ret;
}
#endif
static void resize_fe(frontend *fe) static void resize_fe(frontend *fe)
{ {
int x, y; int x, y;
@ -1942,7 +1960,7 @@ static void resize_fe(frontend *fe)
get_size(fe, &x, &y); get_size(fe, &x, &y);
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
gtk_window_resize_to_geometry(GTK_WINDOW(fe->window), x, y); gtk_window_resize(GTK_WINDOW(fe->window), x, y + window_extra_height(fe));
#else #else
fe->drawing_area_shrink_pending = FALSE; fe->drawing_area_shrink_pending = FALSE;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y); gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
@ -2648,15 +2666,23 @@ static frontend *new_window(char *arg, int argtype, char **error)
#endif #endif
{ {
GdkGeometry geom; GdkGeometry geom;
geom.base_width = geom.base_height = 0; geom.base_width = 0;
#if GTK_CHECK_VERSION(3,0,0)
geom.base_height = window_extra_height(fe);
gtk_window_set_geometry_hints(GTK_WINDOW(fe->window), NULL,
&geom, GDK_HINT_BASE_SIZE);
#else
geom.base_height = 0;
gtk_window_set_geometry_hints(GTK_WINDOW(fe->window), fe->area, gtk_window_set_geometry_hints(GTK_WINDOW(fe->window), fe->area,
&geom, GDK_HINT_BASE_SIZE); &geom, GDK_HINT_BASE_SIZE);
#endif
} }
fe->w = -1; fe->w = -1;
fe->h = -1; fe->h = -1;
get_size(fe, &x, &y); get_size(fe, &x, &y);
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
gtk_window_set_default_geometry(GTK_WINDOW(fe->window), x, y); gtk_window_set_default_size(GTK_WINDOW(fe->window),
x, y + window_extra_height(fe));
#else #else
fe->drawing_area_shrink_pending = FALSE; fe->drawing_area_shrink_pending = FALSE;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y); gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);