InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index c8b774c0bcfde857b7e3adb58ef39b6d0b80dc10..a1b084fe4766362963a63abd32f56ade768b64eb 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -53,7 +53,7 @@ InsetCaption::InsetCaption(Buffer * buf)
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
-       setFrameColor(Color_captionframe);
+       setFrameColor(Color_collapsableframe);
 }
 
 
@@ -152,6 +152,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 
        FontInfo tmpfont = pi.base.font;
        pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
+       pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
        pi.pain.text(x, y, full_label_, pi.base.font);
        InsetText::draw(pi, x + labelwidth_, y);
        pi.base.font = tmpfont;