diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2010-03-28 14:48:32 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2010-03-28 14:48:32 +0000 |
| commit | 40da15205e85d5adbd243195ba9c56614786c1f1 (patch) | |
| tree | 748e9e7ffeacf9636675e1a2e5a7872744ba2178 | |
| parent | 8a49da03f08a4b392544304a13fe9da590faa28e (diff) | |
| download | netsurf-40da15205e85d5adbd243195ba9c56614786c1f1.tar.gz netsurf-40da15205e85d5adbd243195ba9c56614786c1f1.tar.bz2 | |
Adjust alignment and padding of toolbar. All this toolbar code needs throwing away.
svn path=/trunk/netsurf/; revision=10182
| -rw-r--r-- | gtk/gtk_toolbar.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtk_toolbar.c b/gtk/gtk_toolbar.c index b63163c90..5680c2e3a 100644 --- a/gtk/gtk_toolbar.c +++ b/gtk/gtk_toolbar.c @@ -709,6 +709,7 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, imagefile)); GtkWidget *entry = GTK_WIDGET(sexy_icon_entry_new()); GtkWidget *w = GTK_WIDGET(gtk_tool_item_new()); + if ((entry == NULL) || (w == NULL)) { warn_user(messages_get("NoMemory"), 0); return NULL; @@ -718,6 +719,7 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(entry), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(image)); + gtk_container_add(GTK_CONTAINER(w), entry); gtk_tool_item_set_expand(GTK_TOOL_ITEM(w), TRUE); return w; @@ -735,12 +737,12 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, GtkWidget *image = GTK_WIDGET(gtk_image_new_from_pixbuf( nsgtk_throbber->framedata[0])); GtkWidget *w = GTK_WIDGET(gtk_tool_item_new()); - GtkWidget *al = GTK_WIDGET(gtk_alignment_new(0.1,0.1,0.8,0.8)); + GtkWidget *al = GTK_WIDGET(gtk_alignment_new(0.5, 0.5, 1, 1)); if ((w == NULL) || (al == NULL)) { warn_user(messages_get("NoMemory"), 0); return NULL; } - gtk_alignment_set_padding(GTK_ALIGNMENT(al), 0, 0, 6, 0); + gtk_alignment_set_padding(GTK_ALIGNMENT(al), 0, 0, 3, 3); if (image != NULL) gtk_container_add(GTK_CONTAINER(al), image); gtk_container_add(GTK_CONTAINER(w), al); @@ -756,6 +758,7 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, "gtk-info", GTK_ICON_SIZE_LARGE_TOOLBAR)); GtkWidget *entry = GTK_WIDGET(sexy_icon_entry_new()); GtkWidget *w = GTK_WIDGET(gtk_tool_item_new()); + if ((entry == NULL) || (w == NULL)) { warn_user(messages_get("NoMemory"), 0); return NULL; @@ -767,6 +770,7 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(entry), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(image)); + gtk_container_add(GTK_CONTAINER(w), entry); return w; } |