Corrections to computation of extents of text from a font set. (from

Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdkfont.c (gdk_text_extents): Corrections
        to computation of extents of text from a font set.
        (from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
         and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
This commit is contained in:
Owen Taylor 1998-12-12 22:21:48 +00:00 committed by Owen Taylor
parent 11a8051179
commit 823b4d43a1
9 changed files with 57 additions and 8 deletions

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -1,3 +1,10 @@
Sat Dec 12 17:18:32 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_extents): Corrections
to computation of extents of text from a font set.
(from Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
and Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>)
Fri Dec 11 08:59:12 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklistitem.c (gtk_list_item_style_set):

View File

@ -489,15 +489,15 @@ gdk_text_extents (GdkFont *font,
fontset = (XFontSet) private->xfont;
XmbTextExtents (fontset, text, text_length, &ink, &logical);
if (lbearing)
*lbearing = -ink.x;
*lbearing = ink.x;
if (rbearing)
*rbearing = ink.y;
*rbearing = ink.x + ink.width;
if (width)
*width = logical.width;
if (ascent)
*ascent = ink.height;
*ascent = -ink.y;
if (descent)
*descent = -ink.y;
*descent = ink.y + ink.height;
break;
}

View File

@ -489,15 +489,15 @@ gdk_text_extents (GdkFont *font,
fontset = (XFontSet) private->xfont;
XmbTextExtents (fontset, text, text_length, &ink, &logical);
if (lbearing)
*lbearing = -ink.x;
*lbearing = ink.x;
if (rbearing)
*rbearing = ink.y;
*rbearing = ink.x + ink.width;
if (width)
*width = logical.width;
if (ascent)
*ascent = ink.height;
*ascent = -ink.y;
if (descent)
*descent = -ink.y;
*descent = ink.y + ink.height;
break;
}