From 2e0deaa6e77f2081ddbc6c2aa37742e7c172eb09 Mon Sep 17 00:00:00 2001 From: "Ivan, Wong Yat Cheung" Date: Thu, 21 Apr 2005 10:38:14 +0000 Subject: [PATCH] Match character height instead of cell height. Fix #301228. 2005-04-19 Ivan, Wong Yat Cheung * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match character height instead of cell height. Fix #301228. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/win32/gdkfont-win32.c | 4 ++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e086a30a0..b9a41c3cb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-19 Ivan, Wong Yat Cheung + + * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match + character height instead of cell height. Fix #301228. + 2005-04-18 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6e086a30a0..b9a41c3cb4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-04-19 Ivan, Wong Yat Cheung + + * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match + character height instead of cell height. Fix #301228. + 2005-04-18 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6e086a30a0..b9a41c3cb4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-04-19 Ivan, Wong Yat Cheung + + * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match + character height instead of cell height. Fix #301228. + 2005-04-18 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index 2086fe7c8e..62c4d1021e 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -1018,9 +1018,9 @@ gdk_font_load_internal (const gchar *font_name) if (strcmp (point_size, "*") == 0) logfont.lfHeight = 0; else - logfont.lfHeight = (int) (((double) atoi (point_size))/720.*logpixelsy); + logfont.lfHeight = -(int) (((double) atoi (point_size))/720.*logpixelsy); else - logfont.lfHeight = atoi (pixel_size); + logfont.lfHeight = -atoi (pixel_size); logfont.lfWidth = 0; logfont.lfEscapement = 0;