Set the size of the font from the description. (gdk_text_width): Gross
2000-11-29 Alexander Larsson <alexl@redhat.com> * gdk/linux-fb/gdkfont-fb.c (gdk_font_from_description): Set the size of the font from the description. (gdk_text_width): Gross hack that calculates the width of text by text_length * size/2. This is necessary because GtkLabel does some ugly gtk_string_width call to calculate an good size. (linux-fb/gdkprivate-fb.h): Removed unused field FT_Face.
This commit is contained in:
committed by
Alexander Larsson
parent
696d0bc1b0
commit
b1b6c9fc7a
@ -48,8 +48,10 @@ gdk_font_from_description (PangoFontDescription *font_desc)
|
||||
|
||||
private = g_new0 (GdkFontPrivateFB, 1);
|
||||
font = (GdkFont *)private;
|
||||
font->type = GDK_FONT_FONT;
|
||||
private->size = font_desc->size;
|
||||
private->base.ref_count = 1;
|
||||
|
||||
|
||||
return font;
|
||||
}
|
||||
|
||||
@ -294,7 +296,11 @@ gdk_text_width (GdkFont *font,
|
||||
|
||||
return width;
|
||||
#else
|
||||
return 0;
|
||||
GdkFontPrivateFB *private;
|
||||
|
||||
private = (GdkFontPrivateFB*) font;
|
||||
|
||||
return text_length * private->size / (PANGO_SCALE/2);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -147,9 +147,7 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
GdkFontPrivate base;
|
||||
|
||||
FT_Face face;
|
||||
double size;
|
||||
int size;
|
||||
} GdkFontPrivateFB;
|
||||
|
||||
void gdk_fb_font_init(void);
|
||||
|
||||
Reference in New Issue
Block a user