Fix "ugly fades" bug. The border colour was rendered behind the fill colour unless both primary and secondary alpha were non-zero. The \fad and \fade tags both set \alpha rather than \1a \2a \3a \4a, and \alpha is a wholly separate alpha value which wasn't considered at all in this case.

Making it never draw the fill in border colour fixes this and doesn't seem to have any adverse effects.

Originally committed to SVN as r2276.
This commit is contained in:
Niels Martin Hansen 2008-07-22 18:49:20 +00:00
parent e504c61065
commit c54cf755ac

View file

@ -702,11 +702,11 @@ CRect CLine::PaintOutline(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CP
if(w->m_style.borderStyle == 0) if(w->m_style.borderStyle == 0)
{ {
bbox |= w->Draw(spd, clipRect, pAlphaMask, x, y, sw, !w->m_style.alpha[0] && !w->m_style.alpha[1], true); bbox |= w->Draw(spd, clipRect, pAlphaMask, x, y, sw, false, true);
} }
else if(w->m_style.borderStyle == 1 && w->m_pOpaqueBox) else if(w->m_style.borderStyle == 1 && w->m_pOpaqueBox)
{ {
bbox |= w->m_pOpaqueBox->Draw(spd, clipRect, pAlphaMask, x, y, sw, true/*!w->m_style.alpha[0] && !w->m_style.alpha[1]*/, false); bbox |= w->m_pOpaqueBox->Draw(spd, clipRect, pAlphaMask, x, y, sw, true, false);
} }
} }