Option to select menu style

[geeqie.git] / src / layout.cc

diff --git a/src/layout.cc b/src/layout.cc
index 2245f94..8108aab 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -324,6 +324,7 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
        GtkWidget *box;
        GtkWidget *box_folders;
        GtkWidget *box_menu_tabcomp;
+       GtkWidget *menu_bar;
        GtkWidget *menu_tool_bar;
        GtkWidget *open_menu;
        GtkWidget *scd;
@@ -334,6 +335,15 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
 
        if (!options->expand_menu_toolbar)
                {
+               if (!options->hamburger_menu)
+                       {
+                       menu_bar = layout_actions_menu_bar(lw);
+
+                       gtk_widget_show(menu_bar);
+
+                       gq_gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0);
+                       }
+
                toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
                gq_gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
                }
@@ -345,19 +355,27 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
                gq_gtk_box_pack_start(GTK_BOX(lw->main_box), lw->menu_tool_bar, FALSE, FALSE, 0);
                }
 
-       box_menu_tabcomp = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_widget_show(box_menu_tabcomp);
-
-       open_menu = layout_actions_menu_bar(lw);
-       gtk_widget_set_tooltip_text(open_menu, "Open application menu");
-
        tabcomp = tab_completion_new_with_history(&lw->path_entry, nullptr, "path_list", -1, layout_path_entry_cb, lw);
        DEBUG_NAME(tabcomp);
        tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw);
        tab_completion_add_append_func(lw->path_entry, layout_path_entry_tab_append_cb, lw);
-       gq_gtk_box_pack_start(GTK_BOX(box_menu_tabcomp), open_menu, FALSE, FALSE, 0);
-       gq_gtk_box_pack_start(GTK_BOX(box_menu_tabcomp), tabcomp, TRUE, TRUE, 0);
-       gq_gtk_box_pack_start(GTK_BOX(box), box_menu_tabcomp, FALSE, FALSE, 0);
+
+       if (options->hamburger_menu)
+               {
+               box_menu_tabcomp = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+               gtk_widget_show(box_menu_tabcomp);
+
+               open_menu = layout_actions_menu_bar(lw);
+               gtk_widget_set_tooltip_text(open_menu, "Open application menu");
+               gq_gtk_box_pack_start(GTK_BOX(box_menu_tabcomp), open_menu, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(box_menu_tabcomp), tabcomp, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(box), box_menu_tabcomp, FALSE, FALSE, 0);
+               }
+       else
+               {
+               gq_gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
+               }
+
        gtk_widget_show(tabcomp);
        gtk_widget_set_has_tooltip(GTK_WIDGET(tabcomp), TRUE);
        g_signal_connect(G_OBJECT(tabcomp), "query_tooltip", G_CALLBACK(path_entry_tooltip_cb), lw);