mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix font sizing in text widget 

svn path=/trunk/netsurf/; revision=12016
This commit is contained in:
John Mark Bell 2011-03-13 10:52:09 +00:00
parent f218297b77
commit d945884cb1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framebuffer/fbtk/text.c
View File

@ -47,6 +47,9 @@
((((7 * ((c1 >> 8) & 0xff)) >> 3) + 32) << 8) | \ ((((7 * ((c1 >> 8) & 0xff)) >> 3) + 32) << 8) | \
((((7 * (c1 & 0xff)) >> 3) + 32) << 0)) ((((7 * (c1 & 0xff)) >> 3) + 32) << 0))
/* Convert pixels to points, assuming a DPI of 90 */
#define px_to_pt(x) (((x) * 72) / 90)
/** Text redraw callback. /** Text redraw callback.
* *
* Called when a text widget requires redrawing. * Called when a text widget requires redrawing.
@ -91,7 +94,7 @@ fb_redraw_text(fbtk_widget_t *widget, fbtk_callback_info *cbi )
if (widget->u.text.text != NULL) { if (widget->u.text.text != NULL) {
fh = widget->height - border - border; fh = widget->height - border - border;
font_style.family = PLOT_FONT_FAMILY_SANS_SERIF; font_style.family = PLOT_FONT_FAMILY_SANS_SERIF;
font_style.size = fh * FONT_SIZE_SCALE; font_style.size = px_to_pt(fh) * FONT_SIZE_SCALE;
font_style.weight = 400; font_style.weight = 400;
font_style.flags = FONTF_NONE; font_style.flags = FONTF_NONE;
font_style.background = widget->bg; font_style.background = widget->bg;
@ -189,7 +192,7 @@ fb_redraw_text_button(fbtk_widget_t *widget, fbtk_callback_info *cbi )
if (widget->u.text.text != NULL) { if (widget->u.text.text != NULL) {
fh = widget->height - border - border; fh = widget->height - border - border;
font_style.family = PLOT_FONT_FAMILY_SANS_SERIF; font_style.family = PLOT_FONT_FAMILY_SANS_SERIF;
font_style.size = fh * FONT_SIZE_SCALE; font_style.size = px_to_pt(fh) * FONT_SIZE_SCALE;
font_style.weight = 400; font_style.weight = 400;
font_style.flags = FONTF_NONE; font_style.flags = FONTF_NONE;
font_style.background = widget->bg; font_style.background = widget->bg;