From 882cf2d0cdf01e67634a3ddd4744e931f41d473d Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 9 Feb 2022 09:10:50 +0800 Subject: [PATCH] Fix creation of tooltip frames with a stippled background * src/xfns.c (x_create_tip_frame): Init faces after creating the drawable, since that's needed for loading stipple files. --- src/xfns.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 2fd9ad6b054..79df70e73c2 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -7285,19 +7285,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms) gui_default_parameter (f, parms, Qno_special_glyphs, Qnil, NULL, NULL, RES_TYPE_BOOLEAN); - /* Init faces before gui_default_parameter is called for the - scroll-bar-width parameter because otherwise we end up in - init_iterator with a null face cache, which should not happen. */ - init_frame_faces (f); - - f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; - - gui_default_parameter (f, parms, Qinhibit_double_buffering, Qnil, - "inhibitDoubleBuffering", "InhibitDoubleBuffering", - RES_TYPE_BOOLEAN); - - gui_figure_window_size (f, parms, false, false); - { #ifndef USE_XCB XSetWindowAttributes attrs; @@ -7389,6 +7376,19 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms) #endif } + /* Init faces before gui_default_parameter is called for the + scroll-bar-width parameter because otherwise we end up in + init_iterator with a null face cache, which should not happen. */ + init_frame_faces (f); + + gui_default_parameter (f, parms, Qinhibit_double_buffering, Qnil, + "inhibitDoubleBuffering", "InhibitDoubleBuffering", + RES_TYPE_BOOLEAN); + + gui_figure_window_size (f, parms, false, false); + + f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; + x_make_gc (f); gui_default_parameter (f, parms, Qauto_raise, Qnil, -- 2.39.5