InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 832ab2dd9ea2fc818cbf80b69d706c9dcc757acb..d3250579219978a38816a4af995c391eaaad7cbc 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -182,7 +182,7 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 
 bool InsetBox::forcePlainLayout(idx_type) const
 {
-       return !params_.inner_box && params_.type != "Framed";
+       return (!params_.inner_box || params_.use_makebox) && params_.type != "Shaded";
 }
 
 
@@ -223,7 +223,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        case LFUN_BREAK_PARAGRAPH:
-               if (params_.inner_box || params_.type == "Framed")
+               if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
                flag.setEnabled(false);
                return true;