anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 01:22:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* InsetBox.cpp: framed boxes can have paragraph breaks and environments.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37259 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-01-19 11:21:34 +00:00
parent 0dd9b60658
commit 5d4d36c52c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/InsetBox.cpp
View File

@ -190,7 +190,8 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
bool InsetBox::forcePlainLayout(idx_type) 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; return true;
case LFUN_BREAK_PARAGRAPH: 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); return InsetCollapsable::getStatus(cur, cmd, flag);
flag.setEnabled(false); flag.setEnabled(false);
return true; return true;

6
status.16x
View File

@ -88,6 +88,9 @@ What's new
- Fix crash when inserting quotes with a selection spanning multiple - Fix crash when inserting quotes with a selection spanning multiple
paragraphs (bug 7200). 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). - Fix assertion when pasting a column in a math matrix (bug 7106).
- Remove traces of long removed index settings dialog. This fixes a crash - 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 - Don't allow to set an alignment for rows in math substack environments
(bug 2498). (bug 2498).
- Fix crash when clicking on begin of unfinished command in math - Allow paragraph breaks and nested environments in framed boxes.
when autocomplete is active (bug 7209).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION