InsetBox.cpp: 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/trunk@34809 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 893424b04e561f2db92934ca783f54ff0aedaa4e..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";
 }