Author: MarkieB Date: Thu Apr 30 10:42:16 2009 New Revision: 7383 URL: http://source.netsurf-browser.org?rev=7383&view=rev Log: style adjustments to gui; standardisation of search ico size, increasing default window width Modified: branches/MarkieB/search/ (props changed) branches/MarkieB/search/gtk/dialogs/gtk_options.c branches/MarkieB/search/gtk/gtk_scaffolding.c Propchange: branches/MarkieB/search/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Apr 30 10:42:16 2009 @@ -1,1 +1,1 @@ -/branches/dynis/netsurf:1-4310,4345-4486 /branches/adamblokus/netsurf:1-5155 /branches/takkaria/netsurf-hubbub:1-5018 /branches/mikeL/netsurf:1-4272,4275-4285,4287-5188 /branches/vince/netsurf-fb:1-5422 /trunk/netsurf:1-7292 +/branches/adamblokus/netsurf:1-5155 /branches/dynis/netsurf:1-4310,4345-4486 /branches/mikeL/netsurf:1-4272,4275-4285,4287-5188 /branches/takkaria/netsurf-hubbub:1-5018 /branches/vince/netsurf-fb:1-5422 Modified: branches/MarkieB/search/gtk/dialogs/gtk_options.c URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/dialogs/gtk... ============================================================================== --- branches/MarkieB/search/gtk/dialogs/gtk_options.c (original) +++ branches/MarkieB/search/gtk/dialogs/gtk_options.c Thu Apr 30 10:42:16 2009 @@ -710,6 +710,7 @@ struct gui_window *current; GtkImage *searchico; + GdkPixbuf *pbico; char *iconame; gchar *icofile; @@ -729,7 +730,9 @@ current->scaffold->webSearchIcoHolder), GTK_WIDGET(searchico)); - searchico = GTK_IMAGE(gtk_image_new_from_file(icofile)); + pbico = GDK_PIXBUF(gdk_pixbuf_new_from_file_at_size(icofile, 20, 20, + NULL)); + searchico = GTK_IMAGE(gtk_image_new_from_pixbuf(pbico)); gtk_container_add(GTK_CONTAINER( current->scaffold->webSearchIcoHolder), Modified: branches/MarkieB/search/gtk/gtk_scaffolding.c URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/gtk_scaffol... ============================================================================== --- branches/MarkieB/search/gtk/gtk_scaffolding.c (original) +++ branches/MarkieB/search/gtk/gtk_scaffolding.c Thu Apr 30 10:42:16 2009 @@ -1232,6 +1232,7 @@ struct gtk_scaffolding *g = malloc(sizeof(*g)); char *iconame; gchar *icofile; + GdkPixbuf *pbico; GtkImage *searchico; LOG(("Constructing a scaffold of %p for gui_window %p", g, toplevel)); @@ -1289,7 +1290,7 @@ gtk_window_resize(g->window, option_window_width, option_window_height); } else { - gtk_window_set_default_size(g->window, 600, 600); + gtk_window_set_default_size(g->window, 700, 600); } /* Default toolbar button type uses system defaults */ @@ -1425,8 +1426,9 @@ NULL); free(iconame); LOG(("retrieving ico %s\n", icofile)); - searchico = GTK_IMAGE(gtk_image_new_from_file(icofile)); - + pbico = GDK_PIXBUF(gdk_pixbuf_new_from_file_at_size(icofile, 20, 20, + NULL)); + searchico = GTK_IMAGE(gtk_image_new_from_pixbuf(pbico)); g_free(icofile); /* add ico to toolbar */