diff options
| author | Ari Roponen | 2018-05-06 15:29:28 +0300 |
|---|---|---|
| committer | Robert Pluim | 2018-12-10 14:21:54 +0100 |
| commit | 0220391c0015bdec0e658c7ab206c6226bb335ca (patch) | |
| tree | 97e7a508a9dc8687f1ba32e25b2849a79d236596 | |
| parent | 5a7451c383be5e6be52c986a9392ff551e656f6a (diff) | |
| download | emacs-0220391c0015bdec0e658c7ab206c6226bb335ca.tar.gz emacs-0220391c0015bdec0e658c7ab206c6226bb335ca.zip | |
Fix cairo scrolling for side-by-side windows
Backport: Fixes Bug#33442.
* src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling for
side-by-side split windows. (Bug#31288)
(cherry picked from commit 6e362a32bc9d21f73a0f29ca6f45481edeea6f29)
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 577c87a93b1..97a0d97de70 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -4251,6 +4251,7 @@ x_scroll_run (struct window *w, struct run *run) | |||
| 4251 | #ifdef USE_CAIRO | 4251 | #ifdef USE_CAIRO |
| 4252 | if (FRAME_CR_CONTEXT (f)) | 4252 | if (FRAME_CR_CONTEXT (f)) |
| 4253 | { | 4253 | { |
| 4254 | int wx = WINDOW_LEFT_EDGE_X (w); | ||
| 4254 | cairo_surface_t *s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, | 4255 | cairo_surface_t *s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, |
| 4255 | width, height); | 4256 | width, height); |
| 4256 | cairo_t *cr = cairo_create (s); | 4257 | cairo_t *cr = cairo_create (s); |
| @@ -4261,8 +4262,8 @@ x_scroll_run (struct window *w, struct run *run) | |||
| 4261 | 4262 | ||
| 4262 | cr = FRAME_CR_CONTEXT (f); | 4263 | cr = FRAME_CR_CONTEXT (f); |
| 4263 | cairo_save (cr); | 4264 | cairo_save (cr); |
| 4264 | cairo_set_source_surface (cr, s, 0, to_y); | 4265 | cairo_set_source_surface (cr, s, wx, to_y); |
| 4265 | cairo_rectangle (cr, x, to_y, width, height); | 4266 | cairo_rectangle (cr, wx, to_y, width, height); |
| 4266 | cairo_fill (cr); | 4267 | cairo_fill (cr); |
| 4267 | cairo_restore (cr); | 4268 | cairo_restore (cr); |
| 4268 | cairo_surface_destroy (s); | 4269 | cairo_surface_destroy (s); |