Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 88055b4ba00f7e7cab46f241b8e6859b4a125946..3cb7aaad937d9db9b8275d92810d45581e5cfffe 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -32,11 +32,8 @@ namespace frontend { class Painter; }
 */
 class InsetCollapsable : public InsetText {
 public:
-       ///     By default, InsetCollapsable uses the plain layout. If you 
-       /// want to override this in a subclass, you'll need to call 
-       /// Paragraph::setDefaultLayout() in its constructor. See
-       /// InsetBranch for an example.
-       InsetCollapsable(Buffer const &);
+       ///
+       InsetCollapsable(Buffer const &, InsetText::UsePlain = InsetText::PlainLayout);
        ///
        InsetCollapsable(InsetCollapsable const & rhs);
        ///
@@ -48,11 +45,9 @@ public:
        ///
        docstring name() const { return from_ascii("Collapsable"); }
        ///
-       InsetLayout const & getLayout(BufferParams const &) const { return *layout_; }
-       ///
        InsetLayout const & getLayout() const { return *layout_; } 
        ///
-       void setLayout(BufferParams const &);
+       void setLayout();
        /// (Re-)set the character style parameters from \p tc according
        /// to name()
        void setLayout(DocumentClass const * const tc);
@@ -69,8 +64,7 @@ public:
 
        /// return x,y of given position relative to the inset's baseline
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
-       ///
-       bool boundary, int & x, int & y) const;
+               bool boundary, int & x, int & y) const;
        /// Returns true if (mouse) action is over the inset's button.
        /// Always returns false when the inset does not have a
        /// button.
@@ -78,14 +72,19 @@ public:
        ///
        docstring const getNewLabel(docstring const & l) const;
        ///
-       EDITABLE editable(BufferView const & bv) const;
+       bool editable() const;
+       ///
+       bool hasSettings() const { return true; }
        /// can we go further down on mouse click?
-       bool descendable(BufferView const & bv) const;
+       bool descendable() const;
        ///
        void setLabel(docstring const & l);
        ///
        virtual void setButtonLabel() {}
        ///
+       virtual docstring const buttonLabel(BufferView const &) const
+               { return labelstring_; }
+       ///
        bool isOpen(BufferView const & bv) const 
                { return geometry(bv) != ButtonOnly; }
        ///
@@ -106,7 +105,7 @@ public:
         *   Conglomerate | SubLabel            Corners
         *   ---------------------------------------------
         *   *) toggled by openinlined_
-        *   x) toggled by autoOpen_
+        *   x) toggled by auto_open_
         */
 
        /// Default looks
@@ -121,9 +120,11 @@ public:
                Corners
        };
        /// Returns the geometry based on CollapseStatus
-       /// (status_), autoOpen_ and openinlined_, and of
-       /// course decoration().
+       /// (status_), auto_open_[BufferView] and openinlined_,
+       /// and of course decoration().
        Geometry geometry(BufferView const & bv) const;
+       /// Returns the geometry disregarding auto_open_
+       Geometry geometry() const;
        /// Allow spellchecking, except for insets with latex_language
        bool allowSpellCheck() const { return !forceLTR(); }
        ///
@@ -135,22 +136,28 @@ public:
        ///
        bool setMouseHover(bool mouse_hover);
        ///
-       ColorCode backgroundColor() const { return layout_->bgcolor(); }
+       ColorCode backgroundColor() const { return getLayout().bgcolor(); }
+       ///
+       ColorCode labelColor() const { return getLayout().labelfont().color(); }
        ///
        int latex(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
+       /// It will rarely be right to call this from subclasses, due
+       /// to the fact that it steps counters, etc. Instead, call
+       /// InsetText::xhtml().
+       docstring xhtml(odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetCode lyxCode() const { return COLLAPSABLE_CODE; }
 
        /// Allow multiple blanks
-       virtual bool isFreeSpacing() const { return layout_->isFreeSpacing(); }
+       virtual bool isFreeSpacing() const { return getLayout().isFreeSpacing(); }
        /// Don't eliminate empty paragraphs
-       virtual bool allowEmpty() const { return layout_->isKeepEmpty(); }
+       virtual bool allowEmpty() const { return getLayout().isKeepEmpty(); }
        /// Force inset into LTR environment if surroundings are RTL?
-       virtual bool forceLTR() const { return layout_->isForceLtr(); }
+       virtual bool forceLTR() const { return getLayout().isForceLtr(); }
        ///
        virtual bool usePlainLayout() const { return true; }
        /// Is this inset's layout defined in the document's textclass?
@@ -169,7 +176,7 @@ protected:
        ///
        Inset * editXY(Cursor & cur, int x, int y);
        ///
-       docstring floatName(std::string const & type, BufferParams const &) const;
+       docstring floatName(std::string const & type) const;
        ///
        virtual void resetParagraphsFont();
        ///
@@ -178,7 +185,7 @@ private:
        /// cache for the layout_. Make sure it is in sync with the document class!
        InsetLayout const * layout_;
        ///
-       Dimension dimensionCollapsed() const;
+       Dimension dimensionCollapsed(BufferView const & bv) const;
        ///
        /// should paragraphs be forced to use the empty layout?
        virtual bool forcePlainLayout(idx_type = 0) const