comparison src/xterm.c @ 95295:9a9e4682d009

(x_draw_glyph_string): Fix calculation of underline position.

95294:50c2a5438c6c

	      if (s->font && s->font->underline_thickness > 0)
		thickness = s->font->underline_thickness;
	      else
		thickness = 1;
	      if (x_underline_at_descent_line)
		position = (s->height - thickness) - s->ybase;
	      else
		{
		  /* Get the underline position.  This is the recommended
		     vertical offset in pixels from the baseline to the top of
		     the underline.  This is a signed value according to the

		}
	    }
	  /* Check the sanity of thickness and position.  We should
	     avoid drawing underline out of the current line area.  */
	  if (s->y + s->height <= s->ybase + position)
	    position = s->y + s->height - 1;
	  if (s->y + s->height < s->ybase + position + thickness)
	    thickness = (s->y + s->height) - (s->ybase + position);
	  s->underline_thickness = thickness;
	  s->underline_position = position;
	  y = s->ybase + position;

95295:9a9e4682d009

	      if (s->font && s->font->underline_thickness > 0)
		thickness = s->font->underline_thickness;
	      else
		thickness = 1;
	      if (x_underline_at_descent_line)
		position = (s->height - thickness) - (s->ybase - s->y);
	      else
		{
		  /* Get the underline position.  This is the recommended
		     vertical offset in pixels from the baseline to the top of
		     the underline.  This is a signed value according to the

		}
	    }
	  /* Check the sanity of thickness and position.  We should
	     avoid drawing underline out of the current line area.  */
	  if (s->y + s->height <= s->ybase + position)
	    position = (s->height - 1) - (s->ybase - s->y);
	  if (s->y + s->height < s->ybase + position + thickness)
	    thickness = (s->y + s->height) - (s->ybase + position);
	  s->underline_thickness = thickness;
	  s->underline_position = position;
	  y = s->ybase + position;