From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 26 Mar 2019 07:39:07 +0000 (+0900)
Subject: Fix cairo scrolling for left scroll bars case
X-Git-Tag: emacs-27.0.90~3330
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a6cba2bd397414c68217f4f5a9ea2888293ae1c;p=emacs.git

Fix cairo scrolling for left scroll bars case

* src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling by unusing
WINDOW_LEFT_EDGE_X.  (Bug#31288)
---

diff --git a/src/xterm.c b/src/xterm.c
index 1b0c2f5ec50..e3034772a46 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4315,7 +4315,6 @@ x_scroll_run (struct window *w, struct run *run)
 #ifdef USE_CAIRO
   if (FRAME_CR_CONTEXT (f))
     {
-      int wx = WINDOW_LEFT_EDGE_X (w);
       cairo_surface_t *s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
 						       width, height);
       cairo_t *cr = cairo_create (s);
@@ -4326,8 +4325,8 @@ x_scroll_run (struct window *w, struct run *run)
 
       cr = FRAME_CR_CONTEXT (f);
       cairo_save (cr);
-      cairo_set_source_surface (cr, s, wx, to_y);
-      cairo_rectangle (cr, wx, to_y, width, height);
+      cairo_set_source_surface (cr, s, x, to_y);
+      cairo_rectangle (cr, x, to_y, width, height);
       cairo_fill (cr);
       cairo_restore (cr);
       cairo_surface_destroy (s);