summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqsmodo <75080827+qsmodo@users.noreply.github.com>2023-02-11 19:12:57 +0000
committerBram Moolenaar <Bram@vim.org>2023-02-11 19:12:57 +0000
commit094b8473edcc7531c942ac726dd575d95f5b622c (patch)
treefacc7b887cb426e4b00ae9f24ceaaf128642bbfa
parentaab2ead008a66fe873091fa721b2d8d8f4083815 (diff)
downloadvim-git-094b8473edcc7531c942ac726dd575d95f5b622c.tar.gz
patch 9.0.1303: Motif: scrollbar width/height wrong when maximizedv9.0.1303
Problem: Motif: scrollbar width/height wrong when maximized. Solution: Set the width/height when creating the scrollbar. (closes #11946)
-rw-r--r--src/gui_motif.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c
index b25b99186..630082e98 100644
--- 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 058c712eb..470940a57 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1303,
+/**/
1302,
/**/
1301,