# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1622902505 -7200
# Node ID 7342df6f02bb503917eee77860633a544a597bd5
# Parent  ce2fdacbc25b9c39689c310c27135f03fcdcc31d
patch 8.2.2939: GTK: righthand scrollbar does not show with split window

Commit: https://github.com/vim/vim/commit/84e9ade826e7a6a03e0ff5cd9a35b48c4d88367e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jun 5 16:07:37 2021 +0200

    patch 8.2.2939: GTK: righthand scrollbar does not show with split window

    Problem:    GTK: righthand scrollbar does not show with split window.
    Solution:   Adjust padding when two scrollbars are used. (Matt Wozniski,
                closes #8324)

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1050,6 +1050,9 @@ gui_mch_get_scrollbar_xpadding(void)
     xpad = gui.formwin->allocation.width - gui.drawarea->allocation.width
 							 - gui.scrollbar_width;
 #endif
+    if (gui.which_scrollbars[SBAR_LEFT] && gui.which_scrollbars[SBAR_RIGHT])
+	xpad -= gui.scrollbar_width;
+
     return (xpad < 0) ? 0 : xpad;
 }
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2939,
+/**/
     2938,
 /**/
     2937,