diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 18674b8b18..7d5ac90069 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -190,7 +190,8 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const bool InsetBox::forcePlainLayout(idx_type) const { - return !params_.inner_box && params_.type != "Shaded"; + return !params_.inner_box && params_.type != "Shaded" + && params_.type != "Framed"; } @@ -243,7 +244,9 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, return true; case LFUN_BREAK_PARAGRAPH: - if (params_.inner_box || params_.type == "Shaded") + if (params_.inner_box + || params_.type == "Shaded" + || params_.type == "Framed") return InsetCollapsable::getStatus(cur, cmd, flag); flag.setEnabled(false); return true; diff --git a/status.16x b/status.16x index 26e9db7dcc..1e6a64fccd 100644 --- a/status.16x +++ b/status.16x @@ -88,6 +88,9 @@ What's new - Fix crash when inserting quotes with a selection spanning multiple paragraphs (bug 7200). +- Fix crash when clicking on begin of unfinished command in math + when autocomplete is active (bug 7209). + - Fix assertion when pasting a column in a math matrix (bug 7106). - Remove traces of long removed index settings dialog. This fixes a crash @@ -178,8 +181,7 @@ What's new - Don't allow to set an alignment for rows in math substack environments (bug 2498). -- Fix crash when clicking on begin of unfinished command in math - when autocomplete is active (bug 7209). +- Allow paragraph breaks and nested environments in framed boxes. * DOCUMENTATION AND LOCALIZATION