Commit 671b3b0e authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Use new pango_context_get_metrics() to fix problems with font lists in

Tue Jun 26 11:06:34 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
	Use new pango_context_get_metrics() to fix problems
	with font lists in descriptions. (#56184, reported by
	Jonas Borgström)
parent bd2b9eeb
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
......
......@@ -3026,13 +3026,11 @@ gtk_clist_set_row_height (GtkCList *clist,
{
PangoContext *context = gtk_widget_get_pango_context (widget);
PangoFontMetrics metrics;
PangoFont *font = pango_context_load_font (context, widget->style->font_desc);
pango_font_get_metrics (font,
pango_context_get_language (context),
&metrics);
g_object_unref (G_OBJECT (font));
pango_context_get_metrics (context,
widget->style->font_desc,
pango_context_get_language (context),
&metrics);
if (!GTK_CLIST_ROW_HEIGHT_SET(clist))
clist->row_height = PANGO_PIXELS (metrics.ascent + metrics.descent);
......
......@@ -1035,7 +1035,6 @@ gtk_entry_size_request (GtkWidget *widget,
{
GtkEntry *entry;
PangoFontMetrics metrics;
PangoFont *font;
gint xborder, yborder;
PangoContext *context;
......@@ -1045,15 +1044,11 @@ gtk_entry_size_request (GtkWidget *widget,
entry = GTK_ENTRY (widget);
/* hackish for now, get metrics
*/
context = gtk_widget_get_pango_context (widget);
font = pango_context_load_font (context, widget->style->font_desc);
pango_font_get_metrics (font,
pango_context_get_language (context),
&metrics);
g_object_unref (G_OBJECT (font));
pango_context_get_metrics (context,
widget->style->font_desc,
pango_context_get_language (context),
&metrics);
entry->ascent = metrics.ascent;
entry->descent = metrics.descent;
......
......@@ -569,18 +569,15 @@ gtk_spin_button_size_request (GtkWidget *widget,
{
PangoContext *context;
PangoFontMetrics metrics;
PangoFont *font;
gint width;
gint w;
int string_len;
context = gtk_widget_get_pango_context (widget);
font = pango_context_load_font (context,
widget->style->font_desc);
pango_font_get_metrics (font,
pango_context_get_language (context),
&metrics);
g_object_unref (G_OBJECT (font));
pango_context_get_metrics (context,
widget->style->font_desc,
pango_context_get_language (context),
&metrics);
/* Get max of MIN_SPIN_BUTTON_WIDTH, size of upper, size of lower */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment