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
index 77076fcbeb6282ec49a1197a64055bf6102cf7ac..79a1ac3d8e10d02b09fe35c7ed1bca03a9d5cec5 100644 (file)
--- 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
index 3ac26ab405dd0a181f842ba142ee6f1e515a3369..b3de4a3398b4cf65f067cd2c2a7b93cc6decfc04 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2939,
 /**/
     2938,
 /**/