pimpl not needed here

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index b08e20fe446d466f19dda1a6051a6bf4e4a47269..c5f14d07739dff3ac30fcbaa4b61c9a544090d0e 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -81,15 +81,6 @@ InsetCollapsable::InsetCollapsable
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
-       setButtonLabel();
-       // Fallback for lacking inset layout item
-       layout_.bgcolor = Color_background;
-
-       // FIXME: it seems some insets don't properly initialise that!
-       layout_.labelfont = sane_font;
-       layout_.labelfont.decSize();
-       layout_.labelfont.decSize();
-       layout_.labelfont.setColor(Color_collapsable);
 }
 
 
@@ -110,7 +101,16 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
 
 void  InsetCollapsable::setLayout(BufferParams const & bp)
 {
+       // FIXME: put this in the InsetLayout parsing?
+       // Fallback for lacking inset layout background
+       layout_.bgcolor = Color_background;
+
        layout_ = getLayout(bp);
+
+       // FIXME: put this in the InsetLayout parsing?
+       layout_.labelfont.realize(sane_font);
+
+       setButtonLabel();
 }
 
 
@@ -164,7 +164,7 @@ void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
        if (!token_found)
                status_ = isOpen() ? Open : Collapsed;
 
-       setButtonLabel();
+       setLayout(buf.params());
 
        // Force default font, if so requested
        // This avoids paragraphs in buffer language that would have a
@@ -191,7 +191,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        autoOpen_ = mi.base.bv->cursor().isInside(this);
 
        FontInfo tmpfont = mi.base.font;
-       getDrawFont(mi.base.font);
+       mi.base.font = layout_.font;
        mi.base.font.realize(tmpfont);
 
        switch (geometry()) {
@@ -258,7 +258,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
        pi.background_color = backgroundColor();
 
        FontInfo tmpfont = pi.base.font;
-       getDrawFont(pi.base.font);
+       pi.base.font = layout_.font;
        pi.base.font.realize(tmpfont);
 
        // Draw button first -- top, left or only
@@ -620,12 +620,6 @@ void InsetCollapsable::resetParagraphsFont()
 }
 
 
-void InsetCollapsable::getDrawFont(FontInfo & font) const
-{
-       font = layout_.font;
-}
-
-
 bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
@@ -765,18 +759,6 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 }
 
 
-void InsetCollapsable::setLabelFont(FontInfo const & font)
-{
-       layout_.labelfont = font;
-}
-
-
-void InsetCollapsable::setLabelColor(ColorCode code)
-{
-       layout_.labelfont.setColor(code);
-}
-
-
 docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
 {
        FloatList const & floats = bp.getTextClass().floats();