Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/f5ab5703207975bd26635... ...commit http://git.netsurf-browser.org/netsurf.git/commit/f5ab5703207975bd266356a... ...tree http://git.netsurf-browser.org/netsurf.git/tree/f5ab5703207975bd266356aea... The branch, master has been updated via f5ab5703207975bd266356aea95b58cdc91347e9 (commit) from e6b827979b3bb28a82101fe1211c809af112e987 (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=f5ab5703207975bd266... commit f5ab5703207975bd266356aea95b58cdc91347e9 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Disable "native scaled bitmaps" option if we're in palette mapped mode diff --git a/amiga/gui_options.c b/amiga/gui_options.c index ccd4781..cd23880 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -503,7 +503,7 @@ void ami_gui_opts_open(void) BOOL proxyhostdisabled = TRUE, proxyauthdisabled = TRUE, proxybypassdisabled = FALSE; BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE; BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE; - BOOL ditherdisable = TRUE; + BOOL ditherdisable = TRUE, nativebm_disable = FALSE; BOOL download_notify_disabled = FALSE; BOOL ptr_disable = FALSE; char animspeed[10]; @@ -550,8 +550,10 @@ void ami_gui_opts_open(void) screenmodeid = strtoul(nsoption_charp(screen_modeid),NULL,0); } - if(ami_plot_screen_is_palettemapped() == true) + if(ami_plot_screen_is_palettemapped() == true) { ditherdisable = FALSE; + nativebm_disable = TRUE; + } if(nsoption_bool(http_proxy) == true) { @@ -1014,6 +1016,7 @@ void ami_gui_opts_open(void) LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObj, GA_ID, GID_OPTS_NATIVEBM, GA_RelVerify, TRUE, + GA_Disabled, nativebm_disable, CHOOSER_PopUp, TRUE, #ifdef __amigaos4__ CHOOSER_LabelArray, nativebmopts, ----------------------------------------------------------------------- Summary of changes: amiga/gui_options.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amiga/gui_options.c b/amiga/gui_options.c index ccd4781..cd23880 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -503,7 +503,7 @@ void ami_gui_opts_open(void) BOOL proxyhostdisabled = TRUE, proxyauthdisabled = TRUE, proxybypassdisabled = FALSE; BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE; BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE; - BOOL ditherdisable = TRUE; + BOOL ditherdisable = TRUE, nativebm_disable = FALSE; BOOL download_notify_disabled = FALSE; BOOL ptr_disable = FALSE; char animspeed[10]; @@ -550,8 +550,10 @@ void ami_gui_opts_open(void) screenmodeid = strtoul(nsoption_charp(screen_modeid),NULL,0); } - if(ami_plot_screen_is_palettemapped() == true) + if(ami_plot_screen_is_palettemapped() == true) { ditherdisable = FALSE; + nativebm_disable = TRUE; + } if(nsoption_bool(http_proxy) == true) { @@ -1014,6 +1016,7 @@ void ami_gui_opts_open(void) LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObj, GA_ID, GID_OPTS_NATIVEBM, GA_RelVerify, TRUE, + GA_Disabled, nativebm_disable, CHOOSER_PopUp, TRUE, #ifdef __amigaos4__ CHOOSER_LabelArray, nativebmopts, -- NetSurf Browser