Fix mis-nomer

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

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index f24beb5f82986af4a59fb46be9cd1e8684f68ae1..c7b6d65c3a4f193454ba8bc1dcd73d3a9d4ae19c 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -54,22 +54,22 @@ public:
        void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
+       ///
+       virtual void drawBackground(PainterInfo &, int, int) const {}
 
        /// 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;
-       /// Returns true if (mouse) action is over the inset's button.
-       /// Always returns false when the inset does not have a
-       /// button.
-       bool hitButton(FuncRequest const &) const;
        ///
        docstring const getNewLabel(docstring const & l) const;
        ///
        bool editable() const;
        ///
        bool hasSettings() const { return true; }
-       ///
-       bool clickable(BufferView const &, int x, int y) const;
+       /// Returns true if coordinates are over the inset's button.
+       /// Always returns false when the inset does not have a
+       /// button.
+       bool clickable(BufferView const & bv, int x, int y) const;
        /// can we go further down on mouse click?
        bool descendable(BufferView const & bv) const;
        ///
@@ -79,7 +79,7 @@ public:
        ///
        virtual docstring const buttonLabel(BufferView const &) const;
        ///
-       bool isOpen(BufferView const & bv) const 
+       bool isOpen(BufferView const & bv) const
                { return geometry(bv) != ButtonOnly; }
        ///
        enum CollapseStatus {
@@ -90,7 +90,7 @@ public:
        virtual void setStatus(Cursor & cur, CollapseStatus st);
        ///
        CollapseStatus status(BufferView const & bv) const;
-       /** Of the old CollapseStatus we only keep the values  
+       /** 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)
@@ -128,8 +128,8 @@ public:
        /// (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;
+       ///
+       bool canPaintChange(BufferView const & bv) const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
@@ -152,7 +152,7 @@ protected:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       void edit(Cursor & cur, bool front, 
+       void edit(Cursor & cur, bool front,
                EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
@@ -163,15 +163,23 @@ private:
        Dimension dimensionCollapsed(BufferView const & bv) const;
        ///
        docstring labelstring_;
+
+       // These variables depend of the view in which the inset is displayed
+       struct View
+       {
+               /// The dimension of the inset button
+               Box button_dim_;
+               /// a substatus of the Open status, determined automatically in metrics
+               bool openinlined_;
+               /// the inset will automatically open when the cursor is inside. This is
+               /// dependent on the bufferview, compare with MathMacro::editing_.
+               bool auto_open_;
+               /// changes color when mouse enters/leaves this inset
+               bool mouse_hover_;
+       };
+
        ///
-       mutable Box button_dim;
-       /// a substatus of the Open status, determined automatically in metrics
-       mutable bool openinlined_;
-       /// the inset will automatically open when the cursor is inside. This is
-       /// dependent on the bufferview, compare with MathMacro::editing_.
-       mutable std::map<BufferView const *, bool> auto_open_;
-       /// changes color when mouse enters/leaves this inset
-       mutable std::map<BufferView const *, bool> mouse_hover_;
+       mutable std::map<BufferView const *, View> view_;
 };
 
 } // namespace lyx