|
|
|
@ -430,14 +430,17 @@ view_curses::mvwattrline(WINDOW* window,
|
|
|
|
|
short cur_fg, cur_bg;
|
|
|
|
|
pair_content(cur_pair, &cur_fg, &cur_bg);
|
|
|
|
|
|
|
|
|
|
if (fg_color[lpc] != -1 && bg_color[lpc] == -1
|
|
|
|
|
&& base_attrs.ta_bg_color.value_or(0) >= 0)
|
|
|
|
|
if (fg_color[lpc] >= 0
|
|
|
|
|
&& fg_color[lpc] < view_colors::vc_active_palette->tc_palette.size()
|
|
|
|
|
&& bg_color[lpc] == -1 && base_attrs.ta_bg_color.value_or(0) >= 0
|
|
|
|
|
&& base_attrs.ta_bg_color.value_or(0)
|
|
|
|
|
< view_colors::vc_active_palette->tc_palette.size())
|
|
|
|
|
{
|
|
|
|
|
const auto& fg_color_info
|
|
|
|
|
= view_colors::vc_active_palette->tc_palette[fg_color[lpc]];
|
|
|
|
|
= view_colors::vc_active_palette->tc_palette.at(fg_color[lpc]);
|
|
|
|
|
const auto& bg_color_info
|
|
|
|
|
= view_colors::vc_active_palette
|
|
|
|
|
->tc_palette[base_attrs.ta_bg_color.value_or(0)];
|
|
|
|
|
= view_colors::vc_active_palette->tc_palette.at(
|
|
|
|
|
base_attrs.ta_bg_color.value_or(0));
|
|
|
|
|
|
|
|
|
|
if (!fg_color_info.xc_lab_color.sufficient_contrast(
|
|
|
|
|
bg_color_info.xc_lab_color))
|
|
|
|
|