diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-21 11:39:06 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-21 11:39:06 +0900 |
| commit | 21db386ac0df26f0b1a549e0bd4f83c5bbce6361 (patch) | |
| tree | 6a4eada8b92db7f4ccf684299677562656997481 | |
| parent | 6a373e4742386777fe901f040bdcaf0c9056fa70 (diff) | |
| download | emacs-21db386ac0df26f0b1a549e0bd4f83c5bbce6361.tar.gz | |
Fix text metrics calculation in Xft support for lwlib
* lwlib/lwlib-Xaw.c (get_text_width_and_height) [HAVE_XFT]:
* lwlib/xlwmenu.c (string_width) [HAVE_XFT]: Use xOff member instead of width.
| -rw-r--r-- | lwlib/lwlib-Xaw.c | 2 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 8e3a07f202f..9655076da9d 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -154,7 +154,7 @@ get_text_width_and_height (Widget widget, char *text, &gi); bp = cp ? cp + 1 : NULL; h += xft_font->height; - if (w < gi.width) w = gi.width; + if (w < gi.xOff) w = gi.xOff; } *height = h; diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 07ad29e1072..a5704cbfb53 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -332,7 +332,7 @@ string_width (XlwMenuWidget mw, char *s) XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.xft_font, (FcChar8 *) s, strlen (s), &gi); - return gi.width; + return gi.xOff; } #endif #ifdef HAVE_X_I18N |