Fix text frame drawing.

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

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index e9540c741446e7a0eed276c2176557e9123dac59..404458fe51e1e3dce937c2ba2257a1cd31da02fc 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -79,8 +79,6 @@ public:
        ///
        bool isOpen() const { return geometry() != ButtonOnly; }
        ///
-       bool inlined() const { return decoration() == Minimalistic|| decoration() == Conglomerate; }
-       ///
        CollapseStatus status() const;
        /** Of the old CollapseStatus we only keep the values  
         *  Open and Collapsed.
@@ -94,7 +92,7 @@ public:
         *   -------------+-------------------------------
         *   Classic      | *) TopButton, <--x) ButtonOnly
         *                | LeftButton
-        *   Minimalistic | NoButton            NoButton
+        *   Minimalistic | ButtonOnly          NoButton
         *   Conglomerate | SubLabel            Corners
         *   ---------------------------------------------
         *   *) toggled by openinlined_
@@ -108,7 +106,7 @@ public:
                Conglomerate
        };
        /// Default looks
-       virtual Decoration decoration() const { return Classic;  }
+       virtual Decoration decoration() const;
        ///
        enum Geometry {
                TopButton,
@@ -130,6 +128,13 @@ public:
        void setStatus(Cursor & cur, CollapseStatus st);
        ///
        bool setMouseHover(bool mouse_hover);
+       ///
+       virtual Color_color backgroundColor() const {return layout_.bgcolor; }
+
+       int latex(Buffer const &, odocstream &,
+                 OutputParams const &) const;
+       ///
+       void validate(LaTeXFeatures &) const;
 
 protected:
        ///
@@ -163,8 +168,6 @@ private:
        mutable bool openinlined_;
        /// the inset will automatically open when the cursor is inside
        mutable bool autoOpen_;
-       ///
-       mutable Dimension textdim_;
        /// changes color when mouse enters/leaves this inset
        bool mouse_hover_;
 };