hi,
because we started to play with colors, i would like to push this small change
from my local patchset the tree.
1. currently we can't configure fixed black color for the corners of textstyle
insets.
having black background means that its impossible to recognize begining/end of
textstyle change.
i changed it to the text foreground color, so standard user is not affected
at all. it would be perhaps more appropriate to give it normal frame color
as we have for collapsable insets, but that would change the default
behaviour. opinions?
(to test this, choose linguistic module, write some text and give it
some particular edit->texstyle)
2. in lyx 1.4 we had text indicating used style which is no more there.
( http://wiki.lyx.org/uploads/LyX/NewInLyX14/charstyle-in-action-1.png )
this was killed by accident or was it intention?
pavel
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index e14a0b2..ccb26a5 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -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;
pi.pain.line(xx1, y + desc - 4,
xx1, y + desc,
- labelColor());
+ Color_foreground);
if (status_ == Open)
pi.pain.line(xx1, y + desc,
xx2, y + desc,
- labelColor());
+ Color_foreground);
else {
// Make status_ value visible:
pi.pain.line(xx1, y + desc,
xx1 + 4, y + desc,
- labelColor());
+ Color_foreground);
pi.pain.line(xx2 - 4, y + desc,
xx2, y + desc,
- labelColor());
+ Color_foreground);
}
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.
if (geometry(bv) == SubLabel) {
@@ -351,12 +351,10 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int
y) const
if (cur.isInside(this)) {
y -= textdim.asc;
y += 3;
- pi.pain.line(xx1, y + 4, xx1, y, labelColor());
- pi.pain.line(xx1 + 4, y, xx1, y, labelColor());
- pi.pain.line(xx2, y + 4, xx2, y,
- labelColor());
- pi.pain.line(xx2 - 4, y, xx2, y,
- labelColor());
+ pi.pain.line(xx1, y + 4, xx1, y, Color_foreground);
+ pi.pain.line(xx1 + 4, y, xx1, y, Color_foreground);
+ pi.pain.line(xx2, y + 4, xx2, y, Color_foreground);
+ pi.pain.line(xx2 - 4, y, xx2, y, Color_foreground);
}
break;
}
