From d13ac3b066e057b9ac3f5c573f68589b4d33fab6 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 9 Dec 2007 11:13:25 +0000 Subject: Increase default font size and line spacing. svn path=/trunk/netsurf/; revision=3660 --- !NetSurf/Resources/CSS,f79 | 2 +- css/css.c | 6 +++--- desktop/options.c | 4 ++-- riscos/configure/con_fonts.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/!NetSurf/Resources/CSS,f79 b/!NetSurf/Resources/CSS,f79 index c8ab9110a..fb656cbef 100644 --- a/!NetSurf/Resources/CSS,f79 +++ b/!NetSurf/Resources/CSS,f79 @@ -8,7 +8,7 @@ html { display: block; } head { display: none; } -body { display: block; padding: 8px; } +body { display: block; padding: 8px; line-height: 1.33; } div { display: block; } div[align=left] > * { margin-right: auto; } diff --git a/css/css.c b/css/css.c index 8527a3b39..878be04cf 100644 --- a/css/css.c +++ b/css/css.c @@ -173,7 +173,7 @@ const struct css_style css_base_style = { CSS_FONT_WEIGHT_NORMAL, { CSS_HEIGHT_AUTO, { 1, CSS_UNIT_EM } }, { CSS_LETTER_SPACING_NORMAL, { 0, CSS_UNIT_PX } }, - { CSS_LINE_HEIGHT_ABSOLUTE, { 1.3 } }, + { CSS_LINE_HEIGHT_ABSOLUTE, { 1.33 } }, { CSS_LIST_STYLE_IMAGE_NONE, 0 }, CSS_LIST_STYLE_POSITION_OUTSIDE, CSS_LIST_STYLE_TYPE_DISC, @@ -258,7 +258,7 @@ const struct css_style css_empty_style = { CSS_FONT_WEIGHT_NOT_SET, { CSS_HEIGHT_NOT_SET, { 1, CSS_UNIT_EM } }, { CSS_LETTER_SPACING_NOT_SET, { 0, CSS_UNIT_PX } }, - { CSS_LINE_HEIGHT_NOT_SET, { 1.3 } }, + { CSS_LINE_HEIGHT_NOT_SET, { 1.33 } }, { CSS_LIST_STYLE_IMAGE_NOT_SET, 0 }, CSS_LIST_STYLE_POSITION_NOT_SET, CSS_LIST_STYLE_TYPE_NOT_SET, @@ -344,7 +344,7 @@ const struct css_style css_blank_style = { CSS_FONT_WEIGHT_INHERIT, { CSS_HEIGHT_AUTO, { 1, CSS_UNIT_EM } }, { CSS_LETTER_SPACING_INHERIT, { 0, CSS_UNIT_PX } }, - { CSS_LINE_HEIGHT_INHERIT, { 1.3 } }, + { CSS_LINE_HEIGHT_INHERIT, { 1.33 } }, { CSS_LIST_STYLE_IMAGE_INHERIT, 0 }, CSS_LIST_STYLE_POSITION_INHERIT, CSS_LIST_STYLE_TYPE_INHERIT, diff --git a/desktop/options.c b/desktop/options.c index 9d04dabd5..4383dc388 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -63,9 +63,9 @@ char *option_http_proxy_auth_user = 0; /** Proxy authentication password */ char *option_http_proxy_auth_pass = 0; /** Default font size / 0.1pt. */ -int option_font_size = 100; +int option_font_size = 128; /** Minimum font size. */ -int option_font_min_size = 70; +int option_font_min_size = 85; /** Default sans serif font */ char *option_font_sans; /** Default serif font */ diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index d3f4b765e..980a156ba 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -110,8 +110,8 @@ void ro_gui_options_fonts_default(wimp_pointer *pointer) const char *fallback = nsfont_fallback_font(); /* set the default values */ - ro_gui_set_icon_decimal(pointer->w, FONT_DEFAULT_SIZE, 100, 1); - ro_gui_set_icon_decimal(pointer->w, FONT_MINIMUM_SIZE, 70, 1); + ro_gui_set_icon_decimal(pointer->w, FONT_DEFAULT_SIZE, 128, 1); + ro_gui_set_icon_decimal(pointer->w, FONT_MINIMUM_SIZE, 85, 1); ro_gui_set_icon_string(pointer->w, FONT_SANS_FIELD, nsfont_exists("Homerton") ? "Homerton" : fallback); ro_gui_set_icon_string(pointer->w, FONT_SERIF_FIELD, -- cgit v1.2.3