Cosmetics.

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 7c6d49dc6a0cdc6da17c0252e6e9dcabea876400..eab66f093e1b8455a0f6386a1b5b5e1b2f59dec0 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 ;
@@ -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:
@@ -820,22 +815,6 @@ InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 }
 
 
-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,16 @@ bool InsetCollapsable::undefined() const
 }
 
 
+docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+       int y) const
+{
+       if (geometry() != NoButton) {
+               Dimension dim = dimensionCollapsed();
+               if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+                       return docstring();
+       }
+
+       return InsetText::contextMenu(bv, x, y);
+}
+
 } // namespace lyx