anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InsetBox.cpp: backport from trunk

Browse Source 
- only shaded boxes can have multiple paragraphs when there is no inner box
- only shaded boxes can have a non-plain layout when there is no inner box

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34909 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-07-16 01:15:55 +00:00
parent 250b586ff9
commit 9f7bec1798
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/InsetBox.cpp
View File

@ -190,7 +190,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_.type != "Shaded";
}
@ -243,7 +243,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_.type == "Shaded")
return InsetCollapsable::getStatus(cur, cmd, flag);
flag.setEnabled(false);
return true;

3
status.16x
View File

@ -58,7 +58,8 @@ What's new
* USER INTERFACE
- Box dialog: only shaded boxes can have multiple paragraphs when there
is no inner box.
* DOCUMENTATION AND LOCALIZATION