diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2019-08-18 23:45:19 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-09-21 10:53:41 +0100 |
| commit | 89fb88f6dee5322beb3161497cab7a848cb9a4a8 (patch) | |
| tree | bb2f25136a54572d9c1aa6d2830e22fc657f7e16 /frontends/gtk/window.c | |
| parent | 65d169da106d159d9fb53ceb55a5b5899cc0762f (diff) | |
| download | netsurf-89fb88f6dee5322beb3161497cab7a848cb9a4a8.tar.gz netsurf-89fb88f6dee5322beb3161497cab7a848cb9a4a8.tar.bz2 | |
move toolbar to be in tab contents
Diffstat (limited to 'frontends/gtk/window.c')
| -rw-r--r-- | frontends/gtk/window.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c index fc893c92f..1c21a3eb6 100644 --- a/frontends/gtk/window.c +++ b/frontends/gtk/window.c @@ -95,7 +95,10 @@ struct gui_window { /** previous event location */ int last_x, last_y; - /** The top level container (tabContents) */ + /** controls toolbar context */ + struct nsgtk_toolbar *toolbar; + + /** The top level container (tabBox) */ GtkWidget *container; /** display widget for this page or frame */ @@ -767,12 +770,20 @@ gui_window_create(struct browser_window *bw, } /* Construct our primary elements */ - g->container = GTK_WIDGET(gtk_builder_get_object(tab_builder, "tabContents")); + g->container = GTK_WIDGET(gtk_builder_get_object(tab_builder, "tabBox")); g->layout = GTK_LAYOUT(gtk_builder_get_object(tab_builder, "layout")); g->status_bar = GTK_LABEL(gtk_builder_get_object(tab_builder, "status_bar")); g->paned = GTK_PANED(gtk_builder_get_object(tab_builder, "hpaned1")); g->input_method = gtk_im_multicontext_new(); + + res = nsgtk_toolbar_create(tab_builder, &g->toolbar); + if (res != NSERROR_OK) { + free(g); + g_object_unref(tab_builder); + return NULL; + } + /* set a default favicon */ g_object_ref(favicon_pixbuf); g->icon = favicon_pixbuf; @@ -863,6 +874,9 @@ gui_window_create(struct browser_window *bw, } nsgtk_tab_add(g, g->container, tempback, messages_get("NewTab"), g->icon); + /* \todo move search bar properly */ + gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(tab_builder, "searchbar"))); + /* safe to drop the reference to the tab_builder as the container is * referenced by the notebook now. */ |