From 295471920def98ce84bc96e5d97c16d250c81621 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 11 Dec 2018 20:39:19 +0100 Subject: patch 8.1.0577: tabpage right-click menu never shows "Close tab" Problem: Tabpage right-click menu never shows "Close tab". Solution: Always create the "Close tab" item but ignore the event if there is only one tab. --- src/gui_motif.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'src/gui_motif.c') diff --git a/src/gui_motif.c b/src/gui_motif.c index 8467c529d4..b6c140be38 100644 --- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -514,21 +514,18 @@ gui_x11_create_widgets(void) XtVaSetValues(scroller, XmNwidth, 0, XmNresizable, False, XmNtraversalOn, False, NULL); - /* Create the tabline popup menu */ + // Create the tabline popup menu tabLine_menu = XmCreatePopupMenu(tabLine, "tabline popup", NULL, 0); - /* Add the buttons to the menu */ - if (first_tabpage->tp_next != NULL) - { - n = 0; - XtSetArg(args[n], XmNuserData, TABLINE_MENU_CLOSE); n++; - xms = XmStringCreate((char *)"Close tab", STRING_TAG); - XtSetArg(args[n], XmNlabelString, xms); n++; - button = XmCreatePushButton(tabLine_menu, "Close", args, n); - XtAddCallback(button, XmNactivateCallback, - (XtCallbackProc)tabline_button_cb, NULL); - XmStringFree(xms); - } + // Add the buttons to the tabline popup menu + n = 0; + XtSetArg(args[n], XmNuserData, TABLINE_MENU_CLOSE); n++; + xms = XmStringCreate((char *)"Close tab", STRING_TAG); + XtSetArg(args[n], XmNlabelString, xms); n++; + button = XmCreatePushButton(tabLine_menu, "Close", args, n); + XtAddCallback(button, XmNactivateCallback, + (XtCallbackProc)tabline_button_cb, NULL); + XmStringFree(xms); n = 0; XtSetArg(args[n], XmNuserData, TABLINE_MENU_NEW); n++; -- cgit v1.2.3