netsurf: branch master updated. release/3.6-274-g7a42134

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7a42134beeda0e080cb8e... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7a42134beeda0e080cb8ef5... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7a42134beeda0e080cb8ef570... The branch, master has been updated via 7a42134beeda0e080cb8ef5702f522dd4faf9e67 (commit) from f162ddc7118ade79a358c4750f22278915f07ea4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7a42134beeda0e080cb... commit 7a42134beeda0e080cb8ef5702f522dd4faf9e67 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; When switching to outline fonts on OS3 reset the fonts TODO: make this change in the GUI when toggling diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index 78dea58..4822840 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -1898,6 +1898,15 @@ static void ami_gui_opts_use(bool save) #ifndef __amigaos4__ GetAttr(GA_Selected, gow->objects[GID_OPTS_FONT_BITMAP], (ULONG *)&data); ami_font_fini(); + + if((nsoption_bool(bitmap_fonts) == true) && (data == false)) { + nsoption_set_charp(font_sans, (char *)strdup("CGTriumvirate")); + nsoption_set_charp(font_serif, (char *)strdup("CGTimes")); + nsoption_set_charp(font_mono, (char *)strdup("LetterGothic")); + nsoption_set_charp(font_cursive, (char *)strdup("CGTriumvirate")); + nsoption_set_charp(font_fantasy, (char *)strdup("CGTimes")); + } + if(data) { nsoption_set_bool(bitmap_fonts, true); } else { ----------------------------------------------------------------------- Summary of changes: frontends/amiga/gui_options.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index 78dea58..4822840 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -1898,6 +1898,15 @@ static void ami_gui_opts_use(bool save) #ifndef __amigaos4__ GetAttr(GA_Selected, gow->objects[GID_OPTS_FONT_BITMAP], (ULONG *)&data); ami_font_fini(); + + if((nsoption_bool(bitmap_fonts) == true) && (data == false)) { + nsoption_set_charp(font_sans, (char *)strdup("CGTriumvirate")); + nsoption_set_charp(font_serif, (char *)strdup("CGTimes")); + nsoption_set_charp(font_mono, (char *)strdup("LetterGothic")); + nsoption_set_charp(font_cursive, (char *)strdup("CGTriumvirate")); + nsoption_set_charp(font_fantasy, (char *)strdup("CGTimes")); + } + if(data) { nsoption_set_bool(bitmap_fonts, true); } else { -- NetSurf Browser