comparison src/xfns.c @ 107819:834292200403

xfns.c (Fx_show_tip): Subtract last glyph's width only when it is for padding.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Sat, 10 Apr 2010 19:59:46 +0900
parents c7670de45d8a
children 117dfaee55b8
comparison
equal deleted inserted replaced
107818:c7670de45d8a 107819:834292200403
5243 break; 5243 break;
5244 5244
5245 /* Let the row go over the full width of the frame. */ 5245 /* Let the row go over the full width of the frame. */
5246 row->full_width_p = 1; 5246 row->full_width_p = 1;
5247 5247
5248 row_width = row->pixel_width;
5248 /* There's a glyph at the end of rows that is used to place 5249 /* There's a glyph at the end of rows that is used to place
5249 the cursor there. Don't include the width of this glyph. */ 5250 the cursor there. Don't include the width of this glyph. */
5250 if (row->used[TEXT_AREA]) 5251 if (row->used[TEXT_AREA])
5251 { 5252 {
5252 last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1]; 5253 last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1];
5253 row_width = row->pixel_width - last->pixel_width; 5254 if (INTEGERP (last->object))
5255 row_width -= last->pixel_width;
5254 } 5256 }
5255 else
5256 row_width = row->pixel_width;
5257 5257
5258 height += row->height; 5258 height += row->height;
5259 width = max (width, row_width); 5259 width = max (width, row_width);
5260 } 5260 }
5261 5261