Fix text frame drawing.

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

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index d0fcb46df095131969d788eaffcea4e7761e6237..404458fe51e1e3dce937c2ba2257a1cd31da02fc 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -16,17 +16,19 @@
 
 #include "Inset.h"
 #include "InsetText.h"
+#include "TextClass.h"
 
-#include "box.h"
-#include "lyxfont.h"
+#include "Box.h"
+#include "Font.h"
 
 #include <string>
 
 namespace lyx {
 
-class LyXText;
+class Text;
 class Paragraph;
 class CursorSlice;
+class InsetLayout;
 
 namespace frontend { class Painter; }
 
@@ -40,11 +42,15 @@ public:
        ///
        static int const TEXT_TO_BOTTOM_OFFSET = 2;
        ///
-       InsetCollapsable(BufferParams const &, CollapseStatus status = Open);
+       InsetCollapsable(BufferParams const &, CollapseStatus status = Inset::Open);
        ///
        InsetCollapsable(InsetCollapsable const & rhs);
        ///
-       void read(Buffer const &, LyXLex &);
+       docstring name() const { return from_ascii("Collapsable"); }
+       ///
+       void setLayout(BufferParams const &);
+       ///
+       void read(Buffer const &, Lexer &);
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
@@ -69,41 +75,82 @@ public:
        ///
        virtual void setButtonLabel() {}
        ///
-       void setLabelFont(LyXFont & f);
-       ///
-       bool isOpen() const { return status_ == Open || status_ == Inlined; }
+       void setLabelFont(Font const & f);
        ///
-       bool inlined() const { return status_ == Inlined; }
+       bool isOpen() const { return geometry() != ButtonOnly; }
        ///
        CollapseStatus status() const;
+       /** Of the old CollapseStatus we only keep the values  
+        *  Open and Collapsed.
+        * We define a list of possible inset decoration
+        * styles, and a list of possible (concrete, visual)
+        * inset geometries. Relationships between them
+        * (geometries in body of table):
+        *
+        *               \       CollapseStatus:
+        *   Decoration:  \ Open                Collapsed
+        *   -------------+-------------------------------
+        *   Classic      | *) TopButton, <--x) ButtonOnly
+        *                | LeftButton
+        *   Minimalistic | ButtonOnly          NoButton
+        *   Conglomerate | SubLabel            Corners
+        *   ---------------------------------------------
+        *   *) toggled by openinlined_
+        *   x) toggled by autoOpen_
+        */
+
+       ///
+       enum Decoration {
+               Classic,
+               Minimalistic,
+               Conglomerate
+       };
+       /// Default looks
+       virtual Decoration decoration() const;
+       ///
+       enum Geometry {
+               TopButton,
+               ButtonOnly,
+               NoButton,
+               LeftButton,
+               SubLabel,
+               Corners
+       };
+       /// Returns the geometry based on CollapseStatus
+       /// (status_), autoOpen_ and openinlined_, and of
+       /// course decoration().
+       Geometry geometry() const;
        ///
        bool allowSpellCheck() const { return true; }
        ///
-       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       void setStatus(LCursor & cur, CollapseStatus st);
+       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:
        ///
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        Dimension dimensionCollapsed() const;
        ///
        Box const & buttonDim() const;
        ///
-       void edit(LCursor & cur, bool left);
-       ///
-       InsetBase * editXY(LCursor & cur, int x, int y);
+       void edit(Cursor & cur, bool left);
        ///
-       void setInlined() { status_ = Inlined; }
+       Inset * editXY(Cursor & cur, int x, int y);
        ///
        docstring floatName(std::string const & type, BufferParams const &) const;
 
 protected:
-       ///
-       LyXFont labelfont_;
        ///
        mutable Box button_dim;
        ///
@@ -111,7 +158,9 @@ protected:
        ///
        mutable int topbaseline;
        ///
-       mutable docstring label;
+       mutable InsetLayout layout_;
+       ///
+       CollapseStatus internalStatus() const { return status_; }
 private:
        ///
        mutable CollapseStatus status_;
@@ -119,14 +168,12 @@ 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_;
 };
 
 // A helper function that pushes the cursor out of the inset.
-void leaveInset(LCursor & cur, InsetBase const & in);
+void leaveInset(Cursor & cur, Inset const & in);
 
 } // namespace lyx