Mercurial > vim
changeset 15134:f2972ff144ab v8.1.0577
patch 8.1.0577: tabpage right-click menu never shows "Close tab"
commit https://github.com/vim/vim/commit/295471920def98ce84bc96e5d97c16d250c81621
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 11 20:39:19 2018 +0100
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 11 Dec 2018 20:45:06 +0100 |
| parents | b5c9b7b790cd |
| children | 229f8e0696c7 |
| files | src/gui.c src/gui_gtk_x11.c src/gui_mac.c src/gui_motif.c src/version.c |
| diffstat | 5 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -3865,10 +3865,14 @@ send_tabline_menu_event(int tabidx, int { char_u string[3]; - /* Don't put events in the input queue now. */ + // Don't put events in the input queue now. if (hold_gui_events) return; + // Cannot close the last tabpage. + if (event == TABLINE_MENU_CLOSE && first_tabpage->tp_next == NULL) + return; + string[0] = CSI; string[1] = KS_TABMENU; string[2] = KE_FILLER;
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3337,9 +3337,7 @@ create_tabline_menu(void) GtkWidget *menu; menu = gtk_menu_new(); - if (first_tabpage->tp_next != NULL) - add_tabline_menu_item(menu, (char_u *)_("Close tab"), - TABLINE_MENU_CLOSE); + add_tabline_menu_item(menu, (char_u *)_("Close tab"), TABLINE_MENU_CLOSE); add_tabline_menu_item(menu, (char_u *)_("New tab"), TABLINE_MENU_NEW); add_tabline_menu_item(menu, (char_u *)_("Open Tab..."), TABLINE_MENU_OPEN);
--- a/src/gui_mac.c +++ b/src/gui_mac.c @@ -6705,8 +6705,7 @@ initialise_tabline(void) // create tabline popup menu required by vim docs (see :he tabline-menu) CreateNewMenu(kTabContextMenuId, 0, &contextMenu); - if (first_tabpage->tp_next != NULL) - AppendMenuItemTextWithCFString(contextMenu, CFSTR("Close Tab"), 0, + AppendMenuItemTextWithCFString(contextMenu, CFSTR("Close Tab"), 0, TABLINE_MENU_CLOSE, NULL); AppendMenuItemTextWithCFString(contextMenu, CFSTR("New Tab"), 0, TABLINE_MENU_NEW, NULL);
--- 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++;