diff options
| author | Po Lu | 2022-02-09 09:10:50 +0800 |
|---|---|---|
| committer | Po Lu | 2022-02-09 09:10:50 +0800 |
| commit | 882cf2d0cdf01e67634a3ddd4744e931f41d473d (patch) | |
| tree | 91b4e9a0fc12c646e77512a26bd1bed5152edacf /src | |
| parent | 2755e6bba0f9dbb4030f51ea3bc258ee23bb41c5 (diff) | |
| download | emacs-882cf2d0cdf01e67634a3ddd4744e931f41d473d.tar.gz emacs-882cf2d0cdf01e67634a3ddd4744e931f41d473d.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 26 |
1 files 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) | |||
| 7285 | gui_default_parameter (f, parms, Qno_special_glyphs, Qnil, | 7285 | gui_default_parameter (f, parms, Qno_special_glyphs, Qnil, |
| 7286 | NULL, NULL, RES_TYPE_BOOLEAN); | 7286 | NULL, NULL, RES_TYPE_BOOLEAN); |
| 7287 | 7287 | ||
| 7288 | /* Init faces before gui_default_parameter is called for the | ||
| 7289 | scroll-bar-width parameter because otherwise we end up in | ||
| 7290 | init_iterator with a null face cache, which should not happen. */ | ||
| 7291 | init_frame_faces (f); | ||
| 7292 | |||
| 7293 | f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; | ||
| 7294 | |||
| 7295 | gui_default_parameter (f, parms, Qinhibit_double_buffering, Qnil, | ||
| 7296 | "inhibitDoubleBuffering", "InhibitDoubleBuffering", | ||
| 7297 | RES_TYPE_BOOLEAN); | ||
| 7298 | |||
| 7299 | gui_figure_window_size (f, parms, false, false); | ||
| 7300 | |||
| 7301 | { | 7288 | { |
| 7302 | #ifndef USE_XCB | 7289 | #ifndef USE_XCB |
| 7303 | XSetWindowAttributes attrs; | 7290 | XSetWindowAttributes attrs; |
| @@ -7389,6 +7376,19 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms) | |||
| 7389 | #endif | 7376 | #endif |
| 7390 | } | 7377 | } |
| 7391 | 7378 | ||
| 7379 | /* Init faces before gui_default_parameter is called for the | ||
| 7380 | scroll-bar-width parameter because otherwise we end up in | ||
| 7381 | init_iterator with a null face cache, which should not happen. */ | ||
| 7382 | init_frame_faces (f); | ||
| 7383 | |||
| 7384 | gui_default_parameter (f, parms, Qinhibit_double_buffering, Qnil, | ||
| 7385 | "inhibitDoubleBuffering", "InhibitDoubleBuffering", | ||
| 7386 | RES_TYPE_BOOLEAN); | ||
| 7387 | |||
| 7388 | gui_figure_window_size (f, parms, false, false); | ||
| 7389 | |||
| 7390 | f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; | ||
| 7391 | |||
| 7392 | x_make_gc (f); | 7392 | x_make_gc (f); |
| 7393 | 7393 | ||
| 7394 | gui_default_parameter (f, parms, Qauto_raise, Qnil, | 7394 | gui_default_parameter (f, parms, Qauto_raise, Qnil, |