aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan D2015-04-03 14:24:44 +0200
committerJan D2015-04-03 14:24:44 +0200
commit5558a14438172634e8802cbaa87abc265e5d7a4c (patch)
treeb75790a3739003a2726b2d2813cdd42fd20947e5 /src
parentfb77948660d9a1d21339bb9657e1227063911ddc (diff)
downloademacs-5558a14438172634e8802cbaa87abc265e5d7a4c.tar.gz
emacs-5558a14438172634e8802cbaa87abc265e5d7a4c.zip
Tool tips for menus did not show any text.
* src/xterm.c (x_update_begin): Don't create any surface for non-visible tip frames, the geometry may be wrong.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xterm.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e41da251ec6..f7941e04280 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 * xterm.c (handle_one_xevent): Always redraw tool tips on 3 * xterm.c (handle_one_xevent): Always redraw tool tips on
4 MapNotify. Update tool tip frame sizes on ConfigureNotify. 4 MapNotify. Update tool tip frame sizes on ConfigureNotify.
5 (x_update_begin): Don't create any surface for non-visible
6 tip frames, the geometry may be wrong.
5 7
62015-03-31 Eli Zaretskii <eliz@gnu.org> 82015-03-31 Eli Zaretskii <eliz@gnu.org>
7 9
diff --git a/src/xterm.c b/src/xterm.c
index 6bd09300c34..f1632f3141d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1038,6 +1038,10 @@ static void
1038x_update_begin (struct frame *f) 1038x_update_begin (struct frame *f)
1039{ 1039{
1040#ifdef USE_CAIRO 1040#ifdef USE_CAIRO
1041 if (! NILP (tip_frame) && XFRAME (tip_frame) == f
1042 && ! FRAME_VISIBLE_P (f))
1043 return;
1044
1041 if (! FRAME_CR_SURFACE (f)) 1045 if (! FRAME_CR_SURFACE (f))
1042 { 1046 {
1043 int width, height; 1047 int width, height;