BUG 3649: display float listings inline, like other float insets

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18413 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 398d22921ae21106ea31c45c5248a15282e41212..d8cf10a7670406b7b416329712cefd38589aa640 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -81,7 +81,7 @@ InsetListings::~InsetListings()
 
 Inset::DisplayType InsetListings::display() const
 {
-       return params().isInline() ? Inline : AlignLeft;
+       return params().isInline() || params().isFloat() ? Inline : AlignLeft;
 }
 
 

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index f651f453b44d465930400002c63e800ee05ac84c..473538475ce773b5a2d77170e136f497383425c1 100644 (file)
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -560,6 +560,12 @@ void InsetListingsParams::fromEncodedString(string const & in)
 }
 
 
+bool InsetListingsParams::isFloat() const
+{
+       return find(keys_.begin(), keys_.end(), "float") != keys_.end();
+}
+
+
 string InsetListingsParams::getParamValue(string const & param) const
 {
        // is this parameter defined?

diff --git a/src/insets/InsetListingsParams.h b/src/insets/InsetListingsParams.h
index 56a70d7fc83b263fc33c65173c967c88e2eeb7c8..828892bedfaa07ff42b75826d2647f478e50f2f8 100644 (file)
--- a/src/insets/InsetListingsParams.h
+++ b/src/insets/InsetListingsParams.h
@@ -60,6 +60,9 @@ public:
        /// 
        bool isInline() const { return inline_; }
 
+       ///
+       bool isFloat() const;
+
        ///
        InsetCollapsable::CollapseStatus status() const { return status_; }