use ascent + descent to get the height of the line instead of the font

* src/vte.c(vte_terminal_open_font_xft): use ascent + descent to get the height
	of the line instead of the font height (#111752).

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d2c0b27..a07a69e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-28 nalin
+	* src/vte.c(vte_terminal_open_font_xft): use ascent + descent to get
+	the height of the line instead of the font height (#111752).
+
 2003-04-22 nalin
 	* src/vte.c: close out PTY completely on EOF or child exit, from HEAD.
 	* gnome-pty-helper: pull up from HEAD.
diff --git a/src/vte.c b/src/vte.c
index 2cd4421a..170568ed 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -10733,7 +10733,12 @@ vte_terminal_open_font_xft(VteTerminal *terminal)
 		if (width == cjk_width) {
 			width /= 2;
 		}
-		height = MAX(terminal->pvt->ftfont->height, (ascent + descent));
+		/* If the height is screwy, try to guess a better value. */
+		height = terminal->pvt->ftfont->ascent +
+			 terminal->pvt->ftfont->descent;
+		if (height == 0) {
+			height = terminal->pvt->ftfont->height;
+		}
 		if (height == 0) {
 			height = glyph_info.height;
 		}