diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2019-09-02 22:07:00 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-09-21 10:53:41 +0100 |
| commit | f6a669464f67bbed442c80cb3b6d207eacf4fa9a (patch) | |
| tree | a8b1f9d10ecdc82e6db5a38bff10367ab564250c /frontends/gtk/toolbar.c | |
| parent | 85b65921ed38b3ce0bd795e9455afbd53610b309 (diff) | |
| download | netsurf-f6a669464f67bbed442c80cb3b6d207eacf4fa9a.tar.gz netsurf-f6a669464f67bbed442c80cb3b6d207eacf4fa9a.tar.bz2 | |
split burger menu from popup context menu
Diffstat (limited to 'frontends/gtk/toolbar.c')
| -rw-r--r-- | frontends/gtk/toolbar.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c index 544b25abd..ad2990a5f 100644 --- a/frontends/gtk/toolbar.c +++ b/frontends/gtk/toolbar.c @@ -283,6 +283,7 @@ nsgtk_theme_image_default(nsgtk_toolbar_button tbbutton, BUTTON_IMAGE(VIEWSOURCE, "gtk-index"); BUTTON_IMAGE(CONTENTS, "gtk-help"); BUTTON_IMAGE(ABOUT, "gtk-about"); + BUTTON_IMAGE(OPENMENU, NSGTK_STOCK_OPEN_MENU); #undef BUTTON_IMAGE case HISTORY_BUTTON: @@ -796,6 +797,7 @@ make_toolbar_item(nsgtk_toolbar_button i, struct nsgtk_theme *theme) MAKE_MENUBUTTON(PREVTAB, gtkPrevTab) MAKE_MENUBUTTON(GUIDE, gtkGuide) MAKE_MENUBUTTON(INFO, gtkUserInformation) + MAKE_MENUBUTTON(OPENMENU, gtkOpenMenu) #undef MAKE_MENUBUTTON default: @@ -3227,8 +3229,7 @@ info_button_clicked_cb(GtkWidget *widget, gpointer data) * \param data The toolbar context passed when the signal was connected * \return TRUE */ -static gboolean -about_button_clicked_cb(GtkWidget *widget, gpointer data) +static gboolean about_button_clicked_cb(GtkWidget *widget, gpointer data) { GtkWindow *parent; /* gtk window widget is in */ @@ -3239,6 +3240,28 @@ about_button_clicked_cb(GtkWidget *widget, gpointer data) } /** + * handler for openmenu tool bar item clicked signal + * + * \param widget The widget the signal is being delivered to. + * \param data The toolbar context passed when the signal was connected + * \return TRUE to indicate signal handled. + */ +static gboolean openmenu_button_clicked_cb(GtkWidget *widget, gpointer data) +{ + struct nsgtk_toolbar *tb = (struct nsgtk_toolbar *)data; + struct gui_window *gw; + struct nsgtk_scaffolding *gs; + + gw = tb->get_ctx; /** \todo stop assuming the context is a gui window */ + + gs = nsgtk_get_scaffold(gw); + + nsgtk_scaffolding_burger_menu(gs); + + return TRUE; +} + +/** * create a toolbar item * * create a toolbar item and set up its default handlers |