prepare for 1.1.6pre2

[lyx.git] / src / insets / insetcollapsable.C

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index e73bdd0cd29aea4fd3ccb9d0733edf7eecda0ddd..ca8f71d31c6bb15cbbcda4fa2f195c25ebcab8ef 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -49,7 +49,7 @@ InsetCollapsable::InsetCollapsable()
 }
 
 
-Inset * InsetCollapsable::Clone() const
+Inset * InsetCollapsable::Clone(Buffer const &) const
 {
     InsetCollapsable * result = new InsetCollapsable();
     result->inset->init(inset);
@@ -187,6 +187,8 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
            h = pain.paperHeight();
        if ((top_x + w) > pain.paperWidth())
            w = pain.paperWidth();
+       if (baseline < 0)
+           h += (baseline - ascent(bv, f));
        pain.fillRectangle(tx, ty - 1, w, h + 2);
        cleared = true;
     }
@@ -379,7 +381,7 @@ bool InsetCollapsable::UpdateInsetInInset(BufferView * bv, Inset *in)
 }
 
 
-int InsetCollapsable::InsetInInsetY()
+unsigned int InsetCollapsable::InsetInInsetY()
 {
     return inset->InsetInInsetY();
 }