X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.C;h=3bc130945558ae3f71fca171c33886faac1d035e;hb=ee72ce87743857b4317da00e6e09cb6842095664;hp=8af5d6d76b3ecd39745e4303280c2117b530ac89;hpb=756af0279404b9dba9918dbbbe1c1f8d51d9fe85;p=lyx.git

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 8af5d6d76b..3bc1309455 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -19,18 +19,18 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "support/LOstream.h"
+#include "support/lstrings.h"
 
 using std::ostream;
 
-InsetCollapsable::InsetCollapsable(Buffer * bf)
-		: InsetText(bf)
+InsetCollapsable::InsetCollapsable() : InsetText()
 {
     collapsed = true;
     label = "Label";
     autocollapse = true;
     autoBreakRows = true;
     framecolor = LColor::footnoteframe;
-    widthOffset = 6; // 2+2 (behind+back), 1+1 (frame)
+    widthOffset = 2 * TEXT_TO_INSET_OFFSET + 2; // 1+1 (frame)
     button_length = button_top_y = button_bottom_y = 0;
     setInsetName("Collapsable");
 }
@@ -38,25 +38,22 @@ InsetCollapsable::InsetCollapsable(Buffer * bf)
 
 Inset * InsetCollapsable::Clone() const
 {
-    InsetCollapsable * result = new InsetCollapsable(buffer);
-    result->init(buffer, this);
+    InsetCollapsable * result = new InsetCollapsable();
+    result->init(this);
 
     result->collapsed = collapsed;
     return result;
 }
 
-void InsetCollapsable::Write(ostream & os) const
+
+void InsetCollapsable::Write(Buffer const * buf, ostream & os) const
 {
-    os << getInsetName() << "\n\ncollapsed ";
-    if (display())
-	os << "false\n";
-    else
-	os << "true\n";
-    WriteParagraphData(os);
+	os << "collapsed " << tostr(!display()) << "\n";
+	WriteParagraphData(buf, os);
 }
 
 
-void InsetCollapsable::Read(LyXLex & lex)
+void InsetCollapsable::Read(Buffer const * buf, LyXLex & lex)
 {
     if (lex.IsOK()) {
 	lex.next();
@@ -66,7 +63,7 @@ void InsetCollapsable::Read(LyXLex & lex)
 	    collapsed = lex.GetBool();
 	}
     }
-    InsetText::Read(lex);
+    InsetText::Read(buf, lex);
 }
 
 
@@ -136,30 +133,30 @@ void InsetCollapsable::draw_collapsed(Painter & pain, LyXFont const & font,
 }
 
 
-void InsetCollapsable::draw(Painter & pain, LyXFont const & f, 
-			    int baseline, float & x) const
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, 
+			    int baseline, float & x, bool cleared) const
 {
+    Painter & pain = bv->painter();
+
     button_length = width_collapsed(pain, labelfont) + 2;
     button_top_y = -ascent_collapsed(pain, f);
     button_bottom_y = descent_collapsed(pain, f);
+    top_x = int(x);
+    top_baseline = baseline;
     if (collapsed) {
 	draw_collapsed(pain, f, baseline, x);
 	return;
     }
 
-    int top_x = int(x);
-
     draw_collapsed(pain, f, baseline, x);
     x -= TEXT_TO_INSET_OFFSET;
 
-    int w =  InsetText::width(pain, f) + TEXT_TO_INSET_OFFSET;
+    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(pain, f, baseline, x);
+    InsetText::draw(bv, f, baseline, x, cleared);
+    pain.rectangle(save_x, baseline - ascent(pain, f), w, h, framecolor);
 }
 
 
@@ -167,7 +164,7 @@ void InsetCollapsable::Edit(BufferView * bv, int x, int y, unsigned int button)
 {
     if (collapsed && autocollapse) {
 	collapsed = false;
-	UpdateLocal(bv, true);
+	UpdateLocal(bv, FULL, false);
 	InsetText::Edit(bv, 0, 0, button);
     } else if (!collapsed) {
 	InsetText::Edit(bv, x, y, button);
@@ -189,13 +186,7 @@ void InsetCollapsable::InsetUnlock(BufferView * bv)
 	collapsed = true;
     }
     InsetText::InsetUnlock(bv);
-    UpdateLocal(bv, false);
-}
-
-
-void InsetCollapsable::UpdateLocal(BufferView * bv, bool flag)
-{
-    InsetText::UpdateLocal(bv, flag);
+    UpdateLocal(bv, FULL, false);
 }
 
 
@@ -215,10 +206,10 @@ void InsetCollapsable::InsetButtonRelease(BufferView * bv,
 	if (collapsed) {
 	    collapsed = false;
 	    InsetText::InsetButtonRelease(bv, 0, 0, button);
-	    UpdateLocal(bv, true);
+	    UpdateLocal(bv, FULL, false);
 	} else {
 	    collapsed = true;
-	    UpdateLocal(bv, false);
+	    UpdateLocal(bv, FULL, false);
 	    bv->unlockInset(this);
 	}
     } else if (!collapsed && (x >= button_length) && (y >= button_top_y)) {
@@ -257,3 +248,11 @@ int InsetCollapsable::getMaxTextWidth(Painter & pain,
     return getMaxWidth(pain, inset) -
 	width_collapsed(pain, labelfont) - widthOffset;
 }
+
+
+void InsetCollapsable::update(BufferView * bv,
+			      LyXFont const & font, bool dodraw)
+{
+    drawTextXOffset = width_collapsed(bv->painter(), font);
+    InsetText::update(bv, font, dodraw);
+}