X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.C;h=0c8a5bef1b166d02abd3712134ca0a32047ec63c;hb=b634b3eb3b5cc1c47fd3bc63294e16536d4f7664;hp=1b171182347a03e6d9f28c95202ad482603ab7ea;hpb=db78dbfa042037997d764adca41d4a3c46ed981b;p=lyx.git

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 1b17118234..0c8a5bef1b 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -16,6 +16,7 @@
 
 #include "buffer.h"
 #include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
 #include "LColor.h"
@@ -34,97 +35,118 @@ using lyx::graphics::PreviewLoader;
 using std::endl;
 using std::string;
 using std::max;
+using std::min;
 using std::ostream;
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
-	: UpdatableInset(), inset(bp), collapsed_(collapsed),
-	  button_dim(0, 0, 0, 0), label("Label"),
-#if 0
-	autocollapse(false),
-#endif
-	  in_update(false), first_after_edit(false)
+InsetCollapsable::InsetCollapsable(BufferParams const & bp,
+	CollapseStatus status)
+	: inset(bp), label("Label"), status_(status), openinlined_(false)
 {
 	inset.setOwner(this);
 	inset.setAutoBreakRows(true);
 	inset.setDrawFrame(InsetText::ALWAYS);
 	inset.setFrameColor(LColor::collapsableframe);
 	setInsetName("Collapsable");
+	setButtonLabel();
 }
 
 
 InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
-	: UpdatableInset(in), inset(in.inset), collapsed_(in.collapsed_),
-	  labelfont_(in.labelfont_), button_dim(0, 0, 0, 0), label(in.label),
-#if 0
-	  autocollapse(in.autocollapse),
-#endif
-	  in_update(false), first_after_edit(false)
+	: UpdatableInset(in), inset(in.inset),
+	  labelfont_(in.labelfont_), label(in.label), status_(in.status_)
 {
 	inset.setOwner(this);
-}
-
-
-bool InsetCollapsable::insertInset(BufferView * bv, InsetOld * in)
-{
-	if (!insetAllowed(in->lyxCode())) {
-		lyxerr << "InsetCollapsable::InsertInset: "
-			"Unable to insert inset." << endl;
-		return false;
-	}
-	return inset.insertInset(bv, in);
+	setButtonLabel();
 }
 
 
 void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 {
-	os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
-	inset.writeParagraphData(buf, os);
+	os << "status ";
+	switch (status_) {
+	case Open:
+		os << "open";
+		break;
+	case Collapsed:
+		os << "collapsed";
+		break;
+	case Inlined:
+		os << "inlined";
+		break;
+	}
+	os << "\n";
+	inset.text_.write(buf, os);
 }
 
 
 void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 {
+	bool token_found = false;
 	if (lex.isOK()) {
 		lex.next();
 		string const token = lex.getString();
-		if (token == "collapsed") {
+		if (token == "status") {
 			lex.next();
-			collapsed_ = lex.getBool();
+			string const tmp_token = lex.getString();
+
+			if (tmp_token == "inlined") {
+				status_ = Inlined;
+				token_found = true;
+			} else if (tmp_token == "collapsed") {
+				status_ = Collapsed;
+				token_found = true;
+			} else if (tmp_token == "open") {
+				status_ = Open;
+				token_found = true;
+			} else {
+				lyxerr << "InsetCollapsable::read: Missing status!"
+				       << endl;
+				// Take countermeasures
+				lex.pushToken(token);
+			}
 		} else {
-			lyxerr << "InsetCollapsable::Read: Missing collapsed!"
-			       << endl;
-			// Take countermeasures
+			lyxerr << "InsetCollapsable::Read: Missing 'status'-tag!"
+				   << endl;
+			// take countermeasures
 			lex.pushToken(token);
 		}
 	}
 	inset.read(buf, lex);
-}
 
+	if (!token_found)
+		status_ = isOpen() ? Open : Collapsed;
 
-void InsetCollapsable::dimension_collapsed(Dimension & dim) const
-{
-	font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
+	setButtonLabel();
 }
 
 
-int InsetCollapsable::height_collapsed() const
+void InsetCollapsable::dimension_collapsed(Dimension & dim) const
 {
-	Dimension dim;
 	font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
-	return dim.asc + dim.des;
 }
 
 
 void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	//lyxerr << "InsetCollapsable::metrics:  width: " << mi.base.textwidth << endl;
-	dimension_collapsed(dim);
-	if (!collapsed_) {
-		Dimension insetdim;
-		inset.metrics(mi, insetdim);
-		dim.des += insetdim.height() + TEXT_TO_BOTTOM_OFFSET;
-		dim.wid = max(dim.wid, insetdim.wid);
+	if (status_ == Inlined) {
+		inset.metrics(mi, dim);
+	} else {
+		dimension_collapsed(dim);
+		if (status_ == Open) {
+			Dimension insetdim;
+			inset.metrics(mi, insetdim);
+			openinlined_ = (insetdim.wid + dim.wid <= mi.base.textwidth);
+			if (openinlined_) {
+				dim.wid += insetdim.wid;
+				dim.des = max(dim.des, insetdim.des);
+				dim.asc = max(dim.asc, insetdim.asc);
+			} else {
+				dim.des += insetdim.height()
+					+ TEXT_TO_BOTTOM_OFFSET;
+				dim.wid = max(dim.wid, insetdim.wid);
+			}
+		}
 	}
 	dim_ = dim;
 }
@@ -136,252 +158,213 @@ void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-	Dimension dim_collapsed;
-	dimension_collapsed(dim_collapsed);
-
-	int const aa  = ascent();
-	button_dim.x1 = 0;
-	button_dim.x2 = dim_collapsed.width();
-	button_dim.y1 = -aa;
-	button_dim.y2 = -aa + dim_collapsed.height();
-
-	if (!isOpen()) {
-		draw_collapsed(pi, x, y);
-		return;
-	}
+	setPosCache(pi, x, y);
 
-	int old_x = x;
-
-	if (!owner())
-		x += scroll();
-
-	top_x = x;
-	top_baseline = y;
-
-	int const bl = y - aa + dim_collapsed.ascent();
-
-	if (inlined) {
+	if (status_ == Inlined) {
 		inset.draw(pi, x, y);
 	} else {
-		draw_collapsed(pi, old_x, bl);
-		inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
+		Dimension dimc;
+		dimension_collapsed(dimc);
+		int const aa  = ascent();
+		button_dim.x1 = x + 0;
+		button_dim.x2 = x + dimc.width();
+		button_dim.y1 = y - aa + pi.base.bv->top_y();
+		button_dim.y2 = y - aa + pi.base.bv->top_y() + dimc.height();
+
+		draw_collapsed(pi, x, y);
+		if (status_ == Open) {
+			if (!owner())
+				x += scroll();
+			
+			if (openinlined_)
+				inset.draw(pi, x + dimc.width(), y - aa + inset.ascent());
+			else 
+				inset.draw(pi, x, y - aa + dimc.height() + inset.ascent());
+		}
 	}
 }
 
 
-void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
+void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
-	// by default, we are not inlined-drawing
-	draw(pi, x, y, false);
+	inset.drawSelection(pi, x, y);
 }
 
 
 InsetOld::EDITABLE InsetCollapsable::editable() const
 {
-	return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
+	return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
-void InsetCollapsable::insetUnlock(BufferView * bv)
+bool InsetCollapsable::descendable() const
 {
-#if 0
-	if (autocollapse) {
-		if (change_label_with_text) {
-			draw_label = get_new_label();
-		} else {
-			draw_label = label;
-		}
-		collapsed_ = true;
-	}
-#endif
-	inset.insetUnlock(bv);
-	if (scroll())
-		scroll(bv, 0.0F);
-	bv->updateInset(this);
+	return status_ != Collapsed;
 }
 
 
-FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
+void InsetCollapsable::lfunMouseRelease(LCursor & cur, FuncRequest & cmd)
 {
-	FuncRequest cmd1 = cmd;
-	cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
-	return cmd1;
-}
-
-
-void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
-{
-	bool ret = false;
-	BufferView * bv = cmd.view();
-
-	if (collapsed_ && cmd.button() != mouse_button::button3) {
-		collapsed_ = false;
-		bv->updateInset(this);
-		bv->buffer()->markDirty();
+	if (cmd.button() == mouse_button::button3) {
+		showInsetDialog(&cur.bv());
 		return;
 	}
 
-	if (cmd.button() != mouse_button::button3 && hitButton(cmd)) {
-		if (collapsed_) {
-			collapsed_ = false;
-		} else {
-			collapsed_ = true;
-			bv->unlockInset(this);
+	switch (status_) {
+
+	case Collapsed:
+		lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
+		setStatus(Open);
+		edit(cur, true);
+		break;
+
+	case Open: {
+		FuncRequest cmd1 = cmd;
+		if (hitButton(cmd1)) {
+			lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+			setStatus(Collapsed);
+			cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+			break;
 		}
-		bv->updateInset(this);
-		bv->buffer()->markDirty();
-	} else if (!collapsed_ && cmd.y > button_dim.y2) {
-		ret = inset.dispatch(adjustCommand(cmd)) == DispatchResult(true, true);
+		lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
+		inset.dispatch(cur, cmd);
+		break;
+	}
+
+	case Inlined:
+		inset.dispatch(cur, cmd);
+		break;
 	}
-	if (cmd.button() == mouse_button::button3 && !ret)
-		showInsetDialog(bv);
 }
 
 
 int InsetCollapsable::latex(Buffer const & buf, ostream & os,
-			    LatexRunParams const & runparams) const
+			    OutputParams const & runparams) const
 {
 	return inset.latex(buf, os, runparams);
 }
 
 
-int InsetCollapsable::ascii(Buffer const & buf, ostream & os,
-			    LatexRunParams const & runparams) const
+int InsetCollapsable::plaintext(Buffer const & buf, ostream & os,
+			    OutputParams const & runparams) const
 {
-	return inset.ascii(buf, os, runparams);
+	return inset.plaintext(buf, os, runparams);
 }
 
 
 int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os,
-			       LatexRunParams const & runparams) const
+			       OutputParams const & runparams) const
 {
 	return inset.linuxdoc(buf, os, runparams);
 }
 
 
 int InsetCollapsable::docbook(Buffer const & buf, ostream & os,
-			      LatexRunParams const & runparams) const
+			      OutputParams const & runparams) const
 {
 	return inset.docbook(buf, os, runparams);
 }
 
 
-bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
+bool InsetCollapsable::hitButton(FuncRequest & cmd) const
 {
 	return button_dim.contains(cmd.x, cmd.y);
 }
 
 
-void InsetCollapsable::edit(BufferView * bv, bool left)
+string const InsetCollapsable::getNewLabel(string const & l) const
 {
-	lyxerr << "InsetCollapsable: edit" << endl;
-	if (!bv->lockInset(this))
-		lyxerr << "InsetCollapsable: can't lock" << endl;
-	inset.edit(bv, left);
-	first_after_edit = true;
-}
-
-/*
-	if (!cmd.argument.empty()) {
-		UpdatableInset::edit(
-		if (collapsed_) {
-			lyxerr << "branch collapsed_" << endl;
-			collapsed_ = false;
-			if (bv->lockInset(this)) {
-				bv->updateInset(this);
-				bv->buffer()->markDirty();
-				inset.dispatch(cmd);
-				first_after_edit = true;
-			}
-		} else {
-			lyxerr << "branch not collapsed_" << endl;
-			if (bv->lockInset(this))
-				inset.dispatch(cmd);
-		}
-		return;
+	string label;
+	pos_type const max_length = 15;
+	pos_type const p_siz = inset.paragraphs().begin()->size();
+	pos_type const n = min(max_length, p_siz);
+	pos_type i = 0;
+	pos_type j = 0;
+	for( ; i < n && j < p_siz; ++j) {
+		if (inset.paragraphs().begin()->isInset(j))
+			continue;
+		label += inset.paragraphs().begin()->getChar(j);
+		++i;
 	}
-	UpdatableInset::edit(cmd, idx, pos);
-*/
-
-
-void InsetCollapsable::edit(BufferView * bv, int x, int y)
-{
-	if (collapsed_) {
-		collapsed_ = false;
-		// set this only here as it should be recollapsed only if
-		// it was already collapsed!
-		first_after_edit = true;
-		if (!bv->lockInset(this))
-			return;
-		bv->updateInset(this);
-		bv->buffer()->markDirty();
-		inset.edit(bv, x, y);
-	} else {
-		if (!bv->lockInset(this))
-			return;
-		if (y <= button_dim.y2)
-			inset.edit(bv, x, 0);
-		else
-			inset.edit(bv, x,
-				ascent() + y - (height_collapsed() + inset.ascent()));
+	if (inset.paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
+		label += "...";
 	}
+	return label.empty() ? l : label;
 }
 
 
-DispatchResult
-InsetCollapsable::priv_dispatch(FuncRequest const & cmd,
-				idx_type & idx, pos_type & pos)
+void InsetCollapsable::edit(LCursor & cur, bool left)
 {
-	//lyxerr << "InsetCollapsable::localDispatch: "
-	//	<< cmd.action << " '" << cmd.argument << "'\n";
-	BufferView * bv = cmd.view();
-	switch (cmd.action) {
-		case LFUN_MOUSE_PRESS:
-			if (!collapsed_ && cmd.y > button_dim.y2)
-				inset.dispatch(adjustCommand(cmd));
-			return DispatchResult(true, true);
-
-		case LFUN_MOUSE_MOTION:
-			if (!collapsed_ && cmd.y > button_dim.y2)
-				inset.dispatch(adjustCommand(cmd));
-			return DispatchResult(true, true);
+	//lyxerr << "InsetCollapsable: edit left/right" << endl;
+	cur.push(*this);
+	inset.edit(cur, left);
+	open();
+}
 
-		case LFUN_MOUSE_RELEASE:
-			lfunMouseRelease(cmd);
-			return DispatchResult(true, true);
 
-		default:
-			DispatchResult const result = inset.dispatch(cmd);
-			first_after_edit = false;
-			return result;
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
+{
+	cur.push(*this);
+	//lyxerr << "InsetCollapsable: edit xy" << endl;
+	if (status_ == Collapsed) {
+		setStatus(Open);
+		inset.edit(cur, true);
+#warning look here
+//we are not calling edit(x,y) because there are no coordinates in the
+//inset yet. I personally think it's ok. (ab)
+		return this;
 	}
+	return inset.editXY(cur, x, y);
 }
 
 
-bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
+void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
-	if (&inset == in)
-		return true;
-	return inset.lockInsetInInset(bv, in);
-}
+	//lyxerr << "\nInsetCollapsable::priv_dispatch (begin): cmd: " << cmd
+	//	<< "  button y: " << button_dim.y2 << endl;
+	switch (cmd.action) {
+		case LFUN_MOUSE_PRESS:
+			if (status_ == Inlined)
+				inset.dispatch(cur, cmd);
+			else if (status_ == Open && !hitButton(cmd))
+				inset.dispatch(cur, cmd);
+			break;
+
+		case LFUN_MOUSE_MOTION:
+			if (status_ == Inlined)
+				inset.dispatch(cur, cmd);
+			else if (status_ == Open && !hitButton(cmd))
+				inset.dispatch(cur, cmd);
+			break;
 
+		case LFUN_MOUSE_RELEASE:
+			lfunMouseRelease(cur, cmd);
+			break;
+
+		case LFUN_INSET_TOGGLE:
+			if (inset.text_.toggleInset(cur))
+				break;
+			if (status_ == Open) {
+				setStatus(Inlined);
+				break;
+			}
+			setStatus(Collapsed);
+			cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+			break;
 
-bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
-					  bool lr)
-{
-	if (&inset == in) {
-		bv->unlockInset(this);
-		return true;
+		default:
+			inset.dispatch(cur, cmd);
+			break;
 	}
-	return inset.unlockInsetInInset(bv, in, lr);
 }
 
 
-int InsetCollapsable::insetInInsetY() const
+bool InsetCollapsable::getStatus(LCursor & cur, FuncRequest const & cmd,
+	FuncStatus & flag) const
 {
-	return inset.insetInInsetY() - (top_baseline - inset.y());
+	return inset.getStatus(cur, cmd, flag);
 }
 
 
@@ -391,136 +374,113 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetCollapsable::getCursor(BufferView & bv, int & x, int & y) const
+void InsetCollapsable::getCursorPos(CursorSlice const & cur,
+	int & x, int & y) const
 {
-	inset.getCursor(bv, x, y);
+	inset.getCursorPos(cur, x, y);
 }
 
 
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
-{
-	inset.getCursorPos(bv, x , y);
-}
-
-
-UpdatableInset * InsetCollapsable::getLockingInset() const
+void InsetCollapsable::getLabelList(Buffer const & buffer,
+				    std::vector<string> & list) const
 {
-	UpdatableInset * in = inset.getLockingInset();
-	if (&inset == in)
-		return const_cast<InsetCollapsable *>(this);
-	return in;
+	inset.getLabelList(buffer, list);
 }
 
 
-UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(InsetOld::Code c)
+int InsetCollapsable::scroll(bool recursive) const
 {
-	if (c == lyxCode())
-		return this;
-	return inset.getFirstLockingInsetOfType(c);
-}
+	int sx = UpdatableInset::scroll(false);
 
+	if (recursive)
+		sx += inset.scroll(false);
 
-void InsetCollapsable::setFont(BufferView * bv, LyXFont const & font,
-			       bool toggleall, bool selectall)
-{
-	inset.setFont(bv, font, toggleall, selectall);
+	return sx;
 }
 
 
-LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
-				       bool const recursive) const
+size_t InsetCollapsable::nargs() const
 {
-	return inset.getLyXText(bv, recursive);
+	return inset.nargs();
 }
 
 
-void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
+LyXText * InsetCollapsable::getText(int i) const
 {
-	inset.deleteLyXText(bv, recursive);
+	return inset.getText(i);
 }
 
 
-void InsetCollapsable::getLabelList(Buffer const & buffer,
-				    std::vector<string> & list) const
+void InsetCollapsable::open()
 {
-	inset.getLabelList(buffer, list);
+	if (status_ == Collapsed)   // ...but not inlined
+		setStatus(Open);
 }
 
 
-int InsetCollapsable::scroll(bool recursive) const
+void InsetCollapsable::close()
 {
-	int sx = UpdatableInset::scroll(false);
-
-	if (recursive)
-		sx += inset.scroll(recursive);
-
-	return sx;
+	setStatus(Collapsed);
 }
 
 
-ParagraphList * InsetCollapsable::getParagraphs(int i) const
+void InsetCollapsable::setLabel(string const & l)
 {
-	return inset.getParagraphs(i);
+	label = l;
 }
 
 
-int InsetCollapsable::numParagraphs() const
+void InsetCollapsable::setStatus(CollapseStatus st)
 {
-	return inset.numParagraphs();
+	status_ = st;
+	setButtonLabel();
 }
 
 
-LyXText * InsetCollapsable::getText(int i) const
+void InsetCollapsable::markErased()
 {
-	return inset.getText(i);
+	inset.markErased();
 }
 
 
-LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
+void InsetCollapsable::addPreview(PreviewLoader & loader) const
 {
-	return inset.cursor(bv);
+	inset.addPreview(loader);
 }
 
 
-void InsetCollapsable::open(BufferView * bv)
+bool InsetCollapsable::insetAllowed(InsetOld::Code code) const
 {
-	if (!collapsed_)
-		return;
-
-	collapsed_ = false;
-	bv->updateInset(this);
+	return inset.insetAllowed(code);
 }
 
 
-void InsetCollapsable::close(BufferView * bv) const
+void InsetCollapsable::setLabelFont(LyXFont & font)
 {
-	if (collapsed_)
-		return;
-
-	collapsed_ = true;
-	bv->updateInset(this);
+	labelfont_ = font;
 }
 
 
-void InsetCollapsable::setLabel(string const & l) const
+void InsetCollapsable::scroll(BufferView & bv, float sx) const
 {
-	label = l;
+	UpdatableInset::scroll(bv, sx);
 }
 
 
-void InsetCollapsable::setCollapsed(bool c) const
+void InsetCollapsable::scroll(BufferView & bv, int offset) const
 {
-	collapsed_ = c;
+	UpdatableInset::scroll(bv, offset);
 }
 
 
-void InsetCollapsable::markErased()
+Box const & InsetCollapsable::buttonDim() const
 {
-	inset.markErased();
+	return button_dim;
 }
 
 
-void InsetCollapsable::addPreview(PreviewLoader & loader) const
+void InsetCollapsable::setBackgroundColor(LColor_color color)
 {
-	inset.addPreview(loader);
+	InsetOld::setBackgroundColor(color);
+	inset.setBackgroundColor(color);
 }