Lot's of updates for new update handling of text-insets

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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 03537313d350a0585a03ab921da72a4a333f3b6f..24457fba6dd235230d5a6f2fbbf0343e7034ba11 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -136,7 +136,7 @@ void InsetCollapsable::draw_collapsed(Painter & pain, LyXFont const & font,
 
 
 void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, 
-                           int baseline, float & x) const
+                           int baseline, float & x, bool cleared) const
 {
     Painter & pain = bv->painter();
 
@@ -155,12 +155,11 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
 
     int w =  InsetText::width(pain, f) + 2 * TEXT_TO_INSET_OFFSET;
     int h = ascent(pain,f) + descent(pain, f);
-    
-    pain.rectangle(int(x), baseline - ascent(pain, f), w, h, framecolor);
-
+    int save_x = static_cast<int>(x);
     x += TEXT_TO_INSET_OFFSET;
     drawTextXOffset = int(x) - top_x;
-    InsetText::draw(bv, f, baseline, x);
+    InsetText::draw(bv, f, baseline, x, cleared);
+    pain.rectangle(save_x, baseline - ascent(pain, f), w, h, framecolor);
 }