Change string

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index a0cae0124412931137eb48a0b320dff8dc768043..7d7cc9a23fe8d9823262969efb86a8f2dc0d30bb 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -53,13 +53,9 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 {
        switch (decoration()) {
        case InsetLayout::Classic:
-               if (status() == Open) {
-                       if (openinlined_)
-                               return LeftButton;
-                       else
-                               return TopButton;
-               } else
-                       return ButtonOnly;
+               if (status() == Open)
+                       return openinlined_ ? LeftButton : TopButton;
+               return ButtonOnly;
 
        case InsetLayout::Minimalistic:
                return status() == Open ? NoButton : ButtonOnly ;
@@ -77,16 +73,16 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 }
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp,
+InsetCollapsable::InsetCollapsable(Buffer const & buf,
                CollapseStatus status, DocumentClass * dc)
-       : InsetText(bp), status_(status),
+       : InsetText(buf), status_(status),
          openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
        setLayout(dc);
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
-       paragraphs().back().setLayout(bp.documentClass().emptyLayout());
+       paragraphs().back().setLayout(buf.params().documentClass().emptyLayout());
 }
 
 
@@ -130,7 +126,7 @@ void InsetCollapsable::setLayout(BufferParams const & bp)
 
 void InsetCollapsable::setLayout(DocumentClass const * const dc)
 {
-       if (dc != 0) {
+       if (dc) {
                layout_ = &(dc->insetLayout(name()));
                labelstring_ = layout_->labelstring();
        } else {
@@ -708,7 +704,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_STATE:
        case LFUN_FONT_UNDERLINE:
        case LFUN_FOOTNOTE_INSERT:
-       case LFUN_HFILL_INSERT:
        case LFUN_HYPERLINK_INSERT:
        case LFUN_INDEX_INSERT:
        case LFUN_INDEX_PRINT:
@@ -753,8 +748,9 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
                        return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_INSET_TOGGLE:
-               if (cmd.argument() == "open" || cmd.argument() == "close" ||
-                   cmd.argument() == "toggle")
+               if ((cmd.argument() == "open" && status_ == Open)
+                       || (cmd.argument() == "close" && status_ != Open)
+                       || cmd.argument() == "toggle")
                        flag.enabled(true);
                else
                        flag.enabled(false);
@@ -814,28 +810,11 @@ InsetLayout::InsetDecoration InsetCollapsable::decoration() const
                break;
        }
        if (lyxCode() == FLEX_CODE)
-               // FIXME: Is this really necessary?
                return InsetLayout::Conglomerate;
        return InsetLayout::Classic;
 }
 
 
-bool InsetCollapsable::isMacroScope() const
-{
-       // layout_ == 0 leads to no latex output, so ignore 
-       // the macros outside
-       if (!layout_)
-               return true;
-
-       // see InsetCollapsable::latex(...) below. In these case
-       // an environment is opened there
-       if (!layout_->latexname().empty())
-               return true;
-
-       return false;
-}
-
-
 int InsetCollapsable::latex(odocstream & os,
                          OutputParams const & runparams) const
 {
@@ -900,4 +879,19 @@ bool InsetCollapsable::undefined() const
 }
 
 
+docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+       int y) const
+{
+       if (geometry() == NoButton)
+               return from_ascii("context-collapsable");
+
+       Dimension dim = dimensionCollapsed();
+       if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+               //FIXME: We should offer the "context-collapsable" menu here too but
+               // this is not possible right now because the cursor must be set first.
+               return docstring();
+
+       return InsetText::contextMenu(bv, x, y);
+}
+
 } // namespace lyx