zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 08:25:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring patch from Ben Hutchings: move all the Gtk resize code into one

Browse Source 
place. (From Debian bug#379452)

[originally from svn r7366]
This commit is contained in:
Jacob Nevins
2007-03-03 22:05:05 +00:00
parent 39d299f579
commit d916cd7ff9
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gtk.c
View File

@ -1100,15 +1100,10 @@ static void get_size(frontend *fe, int *px, int *py)
gdk_window_resize(GTK_WIDGET(win)->window, x, y) gdk_window_resize(GTK_WIDGET(win)->window, x, y)
#endif #endif
static void menu_preset_event(GtkMenuItem *menuitem, gpointer data) static void resize_fe(frontend *fe)
{ {
frontend *fe = (frontend *)data;
game_params *params =
(game_params *)gtk_object_get_data(GTK_OBJECT(menuitem), "user-data");
int x, y; int x, y;
midend_set_params(fe->me, params);
midend_new_game(fe->me);
get_size(fe, &x, &y); get_size(fe, &x, &y);
fe->w = x; fe->w = x;
fe->h = y; fe->h = y;
@ -1120,6 +1115,17 @@ static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
} }
} }
static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
{
frontend *fe = (frontend *)data;
game_params *params =
(game_params *)gtk_object_get_data(GTK_OBJECT(menuitem), "user-data");
midend_set_params(fe->me, params);
midend_new_game(fe->me);
resize_fe(fe);
}
GdkAtom compound_text_atom, utf8_string_atom; GdkAtom compound_text_atom, utf8_string_atom;
int paste_initialised = FALSE; int paste_initialised = FALSE;
@ -1325,7 +1331,6 @@ static void menu_load_event(GtkMenuItem *menuitem, gpointer data)
{ {
frontend *fe = (frontend *)data; frontend *fe = (frontend *)data;
char *name, *err; char *name, *err;
int x, y;
name = file_selector(fe, "Enter name of saved game file to load", FALSE); name = file_selector(fe, "Enter name of saved game file to load", FALSE);
@ -1347,16 +1352,7 @@ static void menu_load_event(GtkMenuItem *menuitem, gpointer data)
return; return;
} }
get_size(fe, &x, &y); resize_fe(fe);
fe->w = x;
fe->h = y;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
{
GtkRequisition req;
gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
}
} }
} }
@ -1383,21 +1379,12 @@ static void menu_config_event(GtkMenuItem *menuitem, gpointer data)
frontend *fe = (frontend *)data; frontend *fe = (frontend *)data;
int which = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(menuitem), int which = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(menuitem),
"user-data")); "user-data"));
int x, y;
if (!get_config(fe, which)) if (!get_config(fe, which))
return; return;
midend_new_game(fe->me); midend_new_game(fe->me);
get_size(fe, &x, &y); resize_fe(fe);
fe->w = x;
fe->h = y;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
{
GtkRequisition req;
gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
}
} }
static void menu_about_event(GtkMenuItem *menuitem, gpointer data) static void menu_about_event(GtkMenuItem *menuitem, gpointer data)