From fda8b97ea634877952acc86d58b75b25537486bb Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sat, 19 Aug 2017 17:17:48 -0700 Subject: [PATCH] Keep the current tab when closing documents to the right of another tab --- src/notebook.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/notebook.c b/src/notebook.c index 412f9e108..9f7787ec9 100644 --- a/src/notebook.c +++ b/src/notebook.c @@ -443,13 +443,16 @@ static void on_close_documents_right_activate(GtkMenuItem *menuitem, GeanyDocume { g_return_if_fail(has_tabs_on_right(doc)); GtkNotebook *nb = GTK_NOTEBOOK(main_widgets.notebook); + gint current_page = gtk_notebook_get_current_page(nb); gint doc_page = document_get_notebook_page(doc); for (gint i = doc_page + 1; i < gtk_notebook_get_n_pages(nb); ) { if (! document_close(document_get_from_page(i))) i++; // only increment if tab wasn't closed } - gtk_notebook_set_current_page(nb, doc_page); + /* keep the current tab to the original one unless it has been closed, in + * which case use the activated one */ + gtk_notebook_set_current_page(nb, MIN(current_page, doc_page)); } -- 2.11.4.GIT