X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.C;h=aec1bf69ec0fdc5901a2008e87fd99723f979d08;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=75c348571b70db3525110b9c5f56c8e5af3e82b2;hpb=1b3f5ee46ff2924c4b374f52ad6317b5fd7ac9a5;p=lyx.git

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 75c348571b..aec1bf69ec 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -15,22 +15,27 @@
 #include "insetcollapsable.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
+#include "FloatList.h"
+#include "FuncStatus.h"
+#include "gettext.h"
 #include "LColor.h"
 #include "lyxlex.h"
 #include "funcrequest.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
-#include "frontends/LyXView.h"
 
 
-using lyx::graphics::PreviewLoader;
+namespace lyx {
+
+using graphics::PreviewLoader;
 
 using std::endl;
 using std::string;
@@ -39,28 +44,42 @@ using std::min;
 using std::ostream;
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp,
-	CollapseStatus status)
-	: inset(bp), label("Label"), status_(status), openinlined_(false)
+InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 {
-	inset.setOwner(this);
-	inset.setAutoBreakRows(true);
-	inset.setDrawFrame(InsetText::ALWAYS);
-	inset.setFrameColor(LColor::collapsableframe);
-	setInsetName("Collapsable");
-	setButtonLabel();
+	return (autoOpen_ && status_ != Inlined) ? Open : status_;
 }
 
 
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
-	: UpdatableInset(in), inset(in.inset),
-	  labelfont_(in.labelfont_), label(in.label), status_(in.status_)
+InsetCollapsable::InsetCollapsable
+		(BufferParams const & bp, CollapseStatus status)
+	: InsetText(bp), label(from_ascii("Label")), status_(status),
+	  openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
-	inset.setOwner(this);
+	setAutoBreakRows(true);
+	setDrawFrame(true);
+	setFrameColor(LColor::collapsableframe);
+	setInsetName(from_ascii("Collapsable"));
 	setButtonLabel();
 }
 
 
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs):
+	InsetText(rhs), 	
+	labelfont_(rhs.labelfont_),
+	button_dim(rhs.button_dim),
+	topx(rhs.topx),
+	topbaseline(rhs.topbaseline),
+	label(rhs.label),
+	status_(rhs.status_),
+	openinlined_(rhs.openinlined_),
+	autoOpen_(rhs.autoOpen_),
+	textdim_(rhs.textdim_),
+	// the sole purpose of this copy constructor
+	mouse_hover_(false)
+{
+}
+
+
 void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 {
 	os << "status ";
@@ -76,7 +95,7 @@ void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 		break;
 	}
 	os << "\n";
-	inset.text_.write(buf, os);
+	text_.write(buf, os);
 }
 
 
@@ -106,13 +125,13 @@ void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 				lex.pushToken(token);
 			}
 		} else {
-			lyxerr << "InsetCollapsable::Read: Missing 'status'-tag!"
+			lyxerr << "InsetCollapsable::read: Missing 'status'-tag!"
 				   << endl;
 			// take countermeasures
 			lex.pushToken(token);
 		}
 	}
-	inset.read(buf, lex);
+	InsetText::read(buf, lex);
 
 	if (!token_found)
 		status_ = isOpen() ? Open : Collapsed;
@@ -121,150 +140,131 @@ void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-void InsetCollapsable::dimension_collapsed(Dimension & dim) const
+Dimension InsetCollapsable::dimensionCollapsed() const
 {
-	font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
+	Dimension dim;
+	theFontMetrics(labelfont_).buttonText(
+		label, dim.wid, dim.asc, dim.des);
+	return dim;
 }
 
 
-void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	if (status_ == Inlined) {
-		inset.metrics(mi, dim);
+	autoOpen_ = mi.base.bv->cursor().isInside(this);
+	mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
+
+	if (status() == Inlined) {
+		InsetText::metrics(mi, dim);
 	} else {
-		dimension_collapsed(dim);
-		if (status_ == Open) {
-			Dimension insetdim;
-			inset.metrics(mi, insetdim);
-			openinlined_ = (insetdim.wid + dim.wid <= mi.base.textwidth);
+		dim = dimensionCollapsed();
+		if (status() == Open) {
+			InsetText::metrics(mi, textdim_);
+			// This expression should not contain mi.base.texwidth
+			openinlined_ = !hasFixedWidth() 
+				&& textdim_.wid < 0.5 * mi.base.bv->workWidth();
 			if (openinlined_) {
-				dim.wid += insetdim.wid;
-				dim.des = max(dim.des, insetdim.des);
-				dim.asc = max(dim.asc, insetdim.asc);
+				// Correct for button width, and re-fit
+				mi.base.textwidth -= dim.wid;
+				InsetText::metrics(mi, textdim_);
+				dim.wid += textdim_.wid;
+				dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
+				dim.asc = textdim_.asc;
 			} else {
-				dim.des += insetdim.height()
-					+ TEXT_TO_BOTTOM_OFFSET;
-				dim.wid = max(dim.wid, insetdim.wid);
+				dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
+				dim.wid = max(dim.wid, textdim_.wid);
 			}
 		}
 	}
+	dim.asc += TEXT_TO_INSET_OFFSET;
+	dim.des += TEXT_TO_INSET_OFFSET;
+	dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+	mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+	bool const changed = dim_ != dim;
 	dim_ = dim;
+	return changed;
 }
 
 
-void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
+bool InsetCollapsable::setMouseHover(bool mouse_hover)
 {
-	pi.pain.buttonText(x, y, label, labelfont_);
+	mouse_hover_ = mouse_hover;
+	return true;
 }
 
 
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-	setPosCache(pi, x, y);
-
-	if (status_ == Inlined) {
-		inset.draw(pi, x, y);
+	const int xx = x + TEXT_TO_INSET_OFFSET;
+	if (status() == Inlined) {
+		InsetText::draw(pi, xx, y);
 	} else {
-		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());
+		Dimension dimc = dimensionCollapsed();
+		int const top  = y - ascent() + TEXT_TO_INSET_OFFSET;
+		button_dim.x1 = xx + 0;
+		button_dim.x2 = xx + dimc.width();
+		button_dim.y1 = top;
+		button_dim.y2 = top + dimc.height();
+
+		pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_, mouse_hover_);
+
+		if (status() == Open) {
+			int textx, texty;
+			if (openinlined_) {
+				textx = xx + dimc.width();
+				texty = top + textdim_.asc;
+			} else {
+				textx = xx;
+				texty = top + dimc.height() + textdim_.asc;
+			}
+			InsetText::draw(pi, textx, texty);
 		}
 	}
+	setPosCache(pi, x, y);
 }
 
 
 void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
-	inset.drawSelection(pi, x, y);
-}
-
-
-InsetOld::EDITABLE InsetCollapsable::editable() const
-{
-	return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
-}
-
-
-bool InsetCollapsable::descendable() const
-{
-	return status_ != Collapsed;
-}
-
-
-void InsetCollapsable::lfunMouseRelease(LCursor & cur, FuncRequest const & cmd)
-{
-	if (cmd.button() == mouse_button::button3) {
-		showInsetDialog(&cur.bv());
-		return;
-	}
-
-	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);
-			cur.dispatched(FINISHED_RIGHT);
-			break;
-		}
-		lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
-		inset.dispatch(cur, cmd);
-		break;
-	}
-
-	case Inlined:
-		inset.dispatch(cur, cmd);
-		break;
+	x += TEXT_TO_INSET_OFFSET;
+	if (status() == Open) {
+		if (openinlined_)
+			x += dimensionCollapsed().wid;
+		else
+			y += dimensionCollapsed().des + textdim_.asc;
 	}
+	if (status() != Collapsed)
+		InsetText::drawSelection(pi, x, y);
 }
 
 
-int InsetCollapsable::latex(Buffer const & buf, ostream & os,
-			    OutputParams const & runparams) const
+void InsetCollapsable::cursorPos(BufferView const & bv, 
+		CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-	return inset.latex(buf, os, runparams);
-}
+	BOOST_ASSERT(status() != Collapsed);
 
+	InsetText::cursorPos(bv, sl, boundary, x, y);
 
-int InsetCollapsable::plaintext(Buffer const & buf, ostream & os,
-			    OutputParams const & runparams) const
-{
-	return inset.plaintext(buf, os, runparams);
+	if (status() == Open) {
+		if (openinlined_)
+			x += dimensionCollapsed().wid;
+		else
+			y += dimensionCollapsed().height() - ascent()
+				+ TEXT_TO_INSET_OFFSET + textdim_.asc;
+	}
+	x += TEXT_TO_INSET_OFFSET;
 }
 
 
-int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os,
-			       OutputParams const & runparams) const
+InsetBase::EDITABLE InsetCollapsable::editable() const
 {
-	return inset.linuxdoc(buf, os, runparams);
+	return status() != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
-int InsetCollapsable::docbook(Buffer const & buf, ostream & os,
-			      OutputParams const & runparams) const
+bool InsetCollapsable::descendable() const
 {
-	return inset.docbook(buf, os, runparams);
+	return status() != Collapsed;
 }
 
 
@@ -274,21 +274,21 @@ bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
 }
 
 
-string const InsetCollapsable::getNewLabel(string const & l) const
+docstring const InsetCollapsable::getNewLabel(docstring const & l) const
 {
-	string label;
+	docstring label;
 	pos_type const max_length = 15;
-	pos_type const p_siz = inset.paragraphs().begin()->size();
+	pos_type const p_siz = 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))
+	for (; i < n && j < p_siz; ++j) {
+		if (paragraphs().begin()->isInset(j))
 			continue;
-		label += inset.paragraphs().begin()->getChar(j);
+		label += paragraphs().begin()->getChar(j);
 		++i;
 	}
-	if (inset.paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
+	if (paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
 		label += "...";
 	}
 	return label.empty() ? l : label;
@@ -299,152 +299,148 @@ void InsetCollapsable::edit(LCursor & cur, bool left)
 {
 	//lyxerr << "InsetCollapsable: edit left/right" << endl;
 	cur.push(*this);
-	inset.edit(cur, left);
-	open();
+	InsetText::edit(cur, left);
 }
 
 
 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)
+	if (status() == Collapsed || (button_dim.contains(x, y) && status() != Inlined))
 		return this;
-	}
-	return inset.editXY(cur, x, y);
+	cur.push(*this);
+	return InsetText::editXY(cur, x, y);
 }
 
 
-void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-	//lyxerr << "\nInsetCollapsable::priv_dispatch (begin): cmd: " << cmd
-	//	<< "  button y: " << button_dim.y2 << endl;
+	//lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd
+	//	<< " cur: " << cur << " bvcur: " << cur.bv().cursor() << 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);
+	case LFUN_MOUSE_PRESS:
+		if (cmd.button() == mouse_button::button1 && hitButton(cmd) && status() != Inlined) {
+			// reset selection if necessary (see bug 3060)
+			if (cur.selection())
+				cur.bv().cursor().clearSelection();
+			else
+				cur.noUpdate();
+			cur.dispatched();
 			break;
+		}
+		if (status() == Inlined)
+			InsetText::doDispatch(cur, cmd);
+		else if (status() == Open && !hitButton(cmd))
+			InsetText::doDispatch(cur, cmd);
+		else
+			cur.undispatched();
+		break;
 
-		case LFUN_MOUSE_MOTION:
-			if (status_ == Inlined)
-				inset.dispatch(cur, cmd);
-			else if (status_ == Open && !hitButton(cmd))
-				inset.dispatch(cur, cmd);
+	case LFUN_MOUSE_MOTION:
+	case LFUN_MOUSE_DOUBLE:
+	case LFUN_MOUSE_TRIPLE:
+		if (status_ == Inlined)
+			InsetText::doDispatch(cur, cmd);
+		else if (status() && !hitButton(cmd))
+			InsetText::doDispatch(cur, cmd);
+		else
+			cur.undispatched();
+		break;
+
+	case LFUN_MOUSE_RELEASE:
+		if (cmd.button() == mouse_button::button3) {
+			// Open the Inset configuration dialog
+			showInsetDialog(&cur.bv());
 			break;
+		}
 
-		case LFUN_MOUSE_RELEASE:
-			lfunMouseRelease(cur, cmd);
+		if (status() == Inlined) {
+			// The mouse click has to be within the inset!
+			InsetText::doDispatch(cur, cmd);
 			break;
+		}
 
-		case LFUN_INSET_TOGGLE:
-			if (inset.text_.toggleInset(cur))
-				break;
-			if (status_ == Open) {
-				setStatus(Inlined);
+		if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+			// if we are selecting, we do not want to
+			// toggle the inset.
+			if (cur.selection())
 				break;
+			// Left button is clicked, the user asks to
+			// toggle the inset visual state.
+			cur.dispatched();
+			cur.updateFlags(Update::Force | Update::FitCursor);
+			if (status() == Collapsed) {
+				setStatus(cur, Open);
+				edit(cur, true);
 			}
-			setStatus(Collapsed);
-			cur.dispatched(FINISHED_RIGHT);
-			break;
-
-		default:
-			inset.dispatch(cur, cmd);
+			else {
+				setStatus(cur, Collapsed);
+			}
+			cur.bv().cursor() = cur;
 			break;
-	}
-}
-
-
-void InsetCollapsable::validate(LaTeXFeatures & features) const
-{
-	inset.validate(features);
-}
-
-
-void InsetCollapsable::getCursorPos(CursorSlice const & cur,
-	int & x, int & y) const
-{
-	inset.getCursorPos(cur, x, y);
-}
-
-
-void InsetCollapsable::getLabelList(Buffer const & buffer,
-				    std::vector<string> & list) const
-{
-	inset.getLabelList(buffer, list);
-}
-
-
-int InsetCollapsable::scroll(bool recursive) const
-{
-	int sx = UpdatableInset::scroll(false);
-
-	if (recursive)
-		sx += inset.scroll(false);
-
-	return sx;
-}
-
+		}
 
-size_t InsetCollapsable::nargs() const
-{
-	return inset.nargs();
-}
+		// The mouse click is within the opened inset.
+		if (status() == Open)
+			InsetText::doDispatch(cur, cmd);
+		break;
 
+	case LFUN_INSET_TOGGLE:
+		if (cmd.argument() == "open")
+			setStatus(cur, Open);
+		else if (cmd.argument() == "close")
+			setStatus(cur, Collapsed);
+		else if (cmd.argument() == "toggle" || cmd.argument().empty())
+			if (isOpen()) {
+				setStatus(cur, Collapsed);
+				cur.forwardPosNoDescend();
+			}
+			else
+				setStatus(cur, Open);
+		else // if assign or anything else
+			cur.undispatched();
+		cur.dispatched();
+		break;
 
-LyXText * InsetCollapsable::getText(int i) const
-{
-	return inset.getText(i);
+	default:
+		InsetText::doDispatch(cur, cmd);
+		break;
+	}
 }
 
 
-void InsetCollapsable::open()
+bool InsetCollapsable::getStatus(LCursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const
 {
-	if (status_ == Collapsed)   // ...but not inlined
-		setStatus(Open);
-}
+	switch (cmd.action) {
 
+	case LFUN_INSET_TOGGLE:
+		if (cmd.argument() == "open" || cmd.argument() == "close" ||
+		    cmd.argument() == "toggle")
+			flag.enabled(true);
+		else
+			flag.enabled(false);
+		return true;
 
-void InsetCollapsable::close()
-{
-	setStatus(Collapsed);
+	default:
+		return InsetText::getStatus(cur, cmd, flag);
+	}
 }
 
 
-void InsetCollapsable::setLabel(string const & l)
+void InsetCollapsable::setLabel(docstring const & l)
 {
 	label = l;
 }
 
 
-void InsetCollapsable::setStatus(CollapseStatus st)
+void InsetCollapsable::setStatus(LCursor & cur, CollapseStatus status)
 {
-	status_ = st;
+	status_ = status;
 	setButtonLabel();
-}
-
-
-void InsetCollapsable::markErased()
-{
-	inset.markErased();
-}
-
-
-void InsetCollapsable::addPreview(PreviewLoader & loader) const
-{
-	inset.addPreview(loader);
-}
-
-
-bool InsetCollapsable::insetAllowed(InsetOld::Code code) const
-{
-	return inset.insetAllowed(code);
+	if (status_ == Collapsed)
+		cur.leaveInset(*this);
 }
 
 
@@ -453,27 +449,13 @@ void InsetCollapsable::setLabelFont(LyXFont & font)
 	labelfont_ = font;
 }
 
-
-void InsetCollapsable::scroll(BufferView & bv, float sx) const
-{
-	UpdatableInset::scroll(bv, sx);
-}
-
-
-void InsetCollapsable::scroll(BufferView & bv, int offset) const
+docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp)
 {
-	UpdatableInset::scroll(bv, offset);
+	FloatList const & floats = bp.getLyXTextClass().floats();
+	FloatList::const_iterator it = floats[type];
+	// FIXME UNICODE
+	return (it == floats.end()) ? from_ascii(type) : _(it->second.name());
 }
 
 
-Box const & InsetCollapsable::buttonDim() const
-{
-	return button_dim;
-}
-
-
-void InsetCollapsable::setBackgroundColor(LColor_color color)
-{
-	InsetOld::setBackgroundColor(color);
-	inset.setBackgroundColor(color);
-}
+} // namespace lyx