mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-10 18:58:10 +00:00
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
This commit is contained in:
parent
d848a5e393
commit
f672df5dc2
@ -81,7 +81,7 @@ InsetListings::~InsetListings()
|
|||||||
|
|
||||||
Inset::DisplayType InsetListings::display() const
|
Inset::DisplayType InsetListings::display() const
|
||||||
{
|
{
|
||||||
return params().isInline() ? Inline : AlignLeft;
|
return params().isInline() || params().isFloat() ? Inline : AlignLeft;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -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
|
string InsetListingsParams::getParamValue(string const & param) const
|
||||||
{
|
{
|
||||||
// is this parameter defined?
|
// is this parameter defined?
|
||||||
|
@ -60,6 +60,9 @@ public:
|
|||||||
///
|
///
|
||||||
bool isInline() const { return inline_; }
|
bool isInline() const { return inline_; }
|
||||||
|
|
||||||
|
///
|
||||||
|
bool isFloat() const;
|
||||||
|
|
||||||
///
|
///
|
||||||
InsetCollapsable::CollapseStatus status() const { return status_; }
|
InsetCollapsable::CollapseStatus status() const { return status_; }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user