Commit 1683f834 authored by David Brown's avatar David Brown
Browse files

Browsers with use default colours set only get redrawn by choices when the...

Browsers with use default colours set only get redrawn by choices when the default colours have actually been changed.
...@@ -756,10 +756,11 @@ static _kernel_oserror * choices_get_contents(void) ...@@ -756,10 +756,11 @@ static _kernel_oserror * choices_get_contents(void)
char * tempstring; char * tempstring;
int reqsize; int reqsize;
fm_typeface * tfptr; fm_typeface * tfptr;
int serif_changed = 0; int serif_changed = 0;
int sans_changed = 0; int sans_changed = 0;
int fixed_changed = 0; int fixed_changed = 0;
int needs_redraw = 0; int needs_redraw = 0;
int colours_changed = 0;
int old_font_size, old_system_font, frac; int old_font_size, old_system_font, frac;
int temp; int temp;
...@@ -911,6 +912,20 @@ static _kernel_oserror * choices_get_contents(void) ...@@ -911,6 +912,20 @@ static _kernel_oserror * choices_get_contents(void)
if (choices.tt_aspect != new_choices->tt_aspect) fixed_changed = 1; if (choices.tt_aspect != new_choices->tt_aspect) fixed_changed = 1;
} }
/* Have the default document colours changed? */
if (
choices.background_colour != new_choices->background_colour ||
choices.text_colour != new_choices->text_colour ||
choices.link_colour != new_choices->link_colour ||
choices.used_colour != new_choices->used_colour ||
choices.followed_colour != new_choices->followed_colour ||
choices.selected_colour != new_choices->selected_colour
)
{
colours_changed = 1;
}
/* Do we need to redraw because certain special items have changed? */ /* Do we need to redraw because certain special items have changed? */
if ( if (
...@@ -1014,7 +1029,9 @@ static _kernel_oserror * choices_get_contents(void) ...@@ -1014,7 +1029,9 @@ static _kernel_oserror * choices_get_contents(void)
if ( if (
needs_redraw || needs_redraw ||
( (
!b->use_source_cols || (!b->use_source_cols &&
colours_changed
) ||
( (
b->background_colour == -1 && b->background_colour == -1 &&
b->background_image == -1 b->background_image == -1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment