[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 21db386: Fix text metrics calculation in Xft suppor
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] master 21db386: Fix text metrics calculation in Xft support for lwlib |
Date: |
Sat, 20 Apr 2019 22:39:29 -0400 (EDT) |
branch: master
commit 21db386ac0df26f0b1a549e0bd4f83c5bbce6361
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>
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.
---
lwlib/lwlib-Xaw.c | 2 +-
lwlib/xlwmenu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 8e3a07f..9655076 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 07ad29e..a5704cb 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 21db386: Fix text metrics calculation in Xft support for lwlib,
YAMAMOTO Mitsuharu <=