patch 9.0.1303: Motif: scrollbar width/height wrong when maximized

Problem:    Motif: scrollbar width/height wrong when maximized.
Solution:   Set the width/height when creating the scrollbar. (closes #11946)

diff --git a/src/gui_motif.c b/src/gui_motif.c
index b25b99186d25d02fb88c79f93e902ecdae64b799..630082e981308fde6bbf77860d69dead57de9cf7 100644 (file)
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1695,7 +1695,7 @@ gui_mch_set_scrollbar_pos(
                XmNtopOffset, y,
                XmNleftOffset, x,
                XmNrightOffset, gui.which_scrollbars[SBAR_RIGHT]
-               ? gui.scrollbar_width : 0,
+                                                    ? gui.scrollbar_width : 0,
                XmNheight, h,
                NULL);
     XtManageChild(sb->id);
@@ -1788,9 +1788,8 @@ gui_mch_create_scrollbar(
     int                orient) // SBAR_VERT or SBAR_HORIZ
 {
     Arg                args[16];
-    int                n;
+    int                n = 0;
 
-    n = 0;
     XtSetArg(args[n], XmNminimum, 0); n++;
     XtSetArg(args[n], XmNorientation,
            (orient == SBAR_VERT) ? XmVERTICAL : XmHORIZONTAL); n++;
@@ -1801,18 +1800,21 @@ gui_mch_create_scrollbar(
            XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++;
            XtSetArg(args[n], XmNbottomAttachment, XmATTACH_OPPOSITE_FORM); n++;
            XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
+           XtSetArg(args[n], XmNwidth, gui.scrollbar_width); n++;
            break;
 
        case SBAR_RIGHT:
            XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++;
            XtSetArg(args[n], XmNbottomAttachment, XmATTACH_OPPOSITE_FORM); n++;
            XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
+           XtSetArg(args[n], XmNwidth, gui.scrollbar_width); n++;
            break;
 
        case SBAR_BOTTOM:
            XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
            XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
            XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
+           XtSetArg(args[n], XmNheight, gui.scrollbar_height); n++;
            break;
     }
 

diff --git a/src/version.c b/src/version.c
index 058c712eba0b2abb12f77154d165d80397b3cc88..470940a57c01756383f9c5913341aec2d86ceefa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1303,
 /**/
     1302,
 /**/