Corners of collapsable insets to be painted via Color_foreground,

not labelColor(). In default theme this makes no change.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg161461.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35233 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-08-30 00:02:10 +00:00
parent b1d6406ac4
commit 433830cdc0

View File

@ -313,22 +313,22 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1; const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
pi.pain.line(xx1, y + desc - 4, pi.pain.line(xx1, y + desc - 4,
xx1, y + desc, xx1, y + desc,
labelColor()); Color_foreground);
if (status_ == Open) if (status_ == Open)
pi.pain.line(xx1, y + desc, pi.pain.line(xx1, y + desc,
xx2, y + desc, xx2, y + desc,
labelColor()); Color_foreground);
else { else {
// Make status_ value visible: // Make status_ value visible:
pi.pain.line(xx1, y + desc, pi.pain.line(xx1, y + desc,
xx1 + 4, y + desc, xx1 + 4, y + desc,
labelColor()); Color_foreground);
pi.pain.line(xx2 - 4, y + desc, pi.pain.line(xx2 - 4, y + desc,
xx2, y + desc, xx2, y + desc,
labelColor()); Color_foreground);
} }
pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3,
y + desc - 4, labelColor()); y + desc - 4, Color_foreground);
// the label below the text. Can be toggled. // the label below the text. Can be toggled.
if (geometry(bv) == SubLabel) { if (geometry(bv) == SubLabel) {
@ -351,12 +351,10 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
if (cur.isInside(this)) { if (cur.isInside(this)) {
y -= textdim.asc; y -= textdim.asc;
y += 3; y += 3;
pi.pain.line(xx1, y + 4, xx1, y, labelColor()); pi.pain.line(xx1, y + 4, xx1, y, Color_foreground);
pi.pain.line(xx1 + 4, y, xx1, y, labelColor()); pi.pain.line(xx1 + 4, y, xx1, y, Color_foreground);
pi.pain.line(xx2, y + 4, xx2, y, pi.pain.line(xx2, y + 4, xx2, y, Color_foreground);
labelColor()); pi.pain.line(xx2 - 4, y, xx2, y, Color_foreground);
pi.pain.line(xx2 - 4, y, xx2, y,
labelColor());
} }
break; break;
} }