From 4db9a06c6c1987fdd5d8175a2d0216683887a772 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 16 Oct 2018 20:44:52 +0300 Subject: [PATCH] X11: Find scrollbars in same window Adding scroll() translations to a window with no scrollbars scrolled the main window message area. --- win/X11/winX.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win/X11/winX.c b/win/X11/winX.c index 10462c978..7eb5da1a7 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -2585,6 +2585,8 @@ Cardinal *num_params; /* The V_DELTA is 1/2 the value of shown. */ if (horiz_sb) { + if (XtWindow(viewport) != XtWindow(horiz_sb)) + return; XtSetArg(arg[0], nhStr(XtNshown), &shown); XtSetArg(arg[1], nhStr(XtNtopOfThumb), &top); XtGetValues(horiz_sb, arg, TWO); @@ -2616,6 +2618,8 @@ Cardinal *num_params; } if (vert_sb) { + if (XtWindow(viewport) != XtWindow(vert_sb)) + return; XtSetArg(arg[0], nhStr(XtNshown), &shown); XtSetArg(arg[1], nhStr(XtNtopOfThumb), &top); XtGetValues(vert_sb, arg, TWO); -- 2.40.0