patch 9.2.0519: GTK4: GUI tabline is not displayed correctly

Problem:  GTK4: GUI tabline is not displayed correctly, and double
          increments the index in the for() loop
Solution: Drop the additional increment (Foxe Chen)

closes: #20299

Co-Authored-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_gtk4.c b/src/gui_gtk4.c
index bc66ba9e7f6499316d35249e853643f21668f6c5..4b02fe1a71710c1687b4873f6b64e9f9e35524f3 100644 (file)
--- a/src/gui_gtk4.c
+++ b/src/gui_gtk4.c
@@ -477,7 +477,7 @@ gui_mch_init(void)
 #ifdef FEAT_GUI_TABLINE
     gui.tabline = gtk_notebook_new();
     gtk_notebook_set_show_border(GTK_NOTEBOOK(gui.tabline), FALSE);
-    gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gui.tabline), FALSE);
+    gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gui.tabline), TRUE);
     gtk_notebook_set_scrollable(GTK_NOTEBOOK(gui.tabline), TRUE);
     gtk_widget_set_visible(gui.tabline, FALSE);
     gtk_box_append(GTK_BOX(vbox), gui.tabline);
@@ -2328,7 +2328,7 @@ gui_mch_update_tabline(void)
            gtk_box_append(GTK_BOX(event_box), label);
            gtk_widget_set_visible(label, TRUE);
            gtk_notebook_insert_page(GTK_NOTEBOOK(gui.tabline),
-                   page, event_box, nr++);
+                   page, event_box, nr);
            gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(gui.tabline),
                    page, TRUE);
        }

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index af452c84683e1003dca7542fce6becad0cd9b71e..b47941acba597f415c8f249093bd19a5f3da893c 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3581,7 +3581,7 @@ gui_mch_update_tabline(void)
            gtk_notebook_insert_page(GTK_NOTEBOOK(gui.tabline),
                    page,
                    event_box,
-                   nr++);
+                   nr);
 # if GTK_CHECK_VERSION(2,10,0)
            gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(gui.tabline),
                    page,

diff --git a/src/version.c b/src/version.c
index caec10bb1ab35a6bb11dac16b3f7dee416cdd515..10480a3c804b347821e7def9ee63f04ca973b897 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    519,
 /**/
     518,
 /**/