Commit 2a229f49 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu

Fix blank tooltips on cairo (Bug#36298)

* src/xterm.h (x_cr_update_surface_desired_size) [USE_CAIRO]: Add extern.
* src/xterm.c (x_cr_update_surface_desired_size) [USE_CAIRO]: Make non-static.
* src/xfns.c (Fx_show_tip) [USE_CAIRO]: Call x_cr_update_surface_desired_size.
parent 2da3305c
......@@ -6956,6 +6956,10 @@ Text larger than the specified size is clipped. */)
XMapRaised (FRAME_X_DISPLAY (tip_f), FRAME_X_WINDOW (tip_f));
unblock_input ();
#ifdef USE_CAIRO
x_cr_update_surface_desired_size (tip_f, width, height);
#endif /* USE_CAIRO */
w->must_be_updated_p = true;
update_single_window (w);
set_buffer_internal_1 (old_buffer);
......
......@@ -345,7 +345,7 @@ x_cr_destroy_frame_context (struct frame *f)
}
}
static void
void
x_cr_update_surface_desired_size (struct frame *f, int width, int height)
{
if (FRAME_CR_SURFACE_DESIRED_WIDTH (f) != width
......
......@@ -1109,6 +1109,7 @@ extern int x_dispatch_event (XEvent *, Display *);
extern int x_x_to_emacs_modifiers (struct x_display_info *, int);
#ifdef USE_CAIRO
extern void x_cr_destroy_frame_context (struct frame *);
extern void x_cr_update_surface_desired_size (struct frame *, int, int);
extern cairo_t *x_begin_cr_clip (struct frame *, GC);
extern void x_end_cr_clip (struct frame *);
extern void x_set_cr_source_with_gc_foreground (struct frame *, GC);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment