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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 3d4434aa79..aec1bf69ec 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -53,7 +53,7 @@ InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 InsetCollapsable::InsetCollapsable
 		(BufferParams const & bp, CollapseStatus status)
 	: InsetText(bp), label(from_ascii("Label")), status_(status),
-	  openinlined_(false), autoOpen_(false)
+	  openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
 	setAutoBreakRows(true);
 	setDrawFrame(true);
@@ -63,6 +63,23 @@ InsetCollapsable::InsetCollapsable
 }
 
 
+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 ";
@@ -132,7 +149,7 @@ Dimension InsetCollapsable::dimensionCollapsed() const
 }
 
 
-void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	autoOpen_ = mi.base.bv->cursor().isInside(this);
 	mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
@@ -144,7 +161,8 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 		if (status() == Open) {
 			InsetText::metrics(mi, textdim_);
 			// This expression should not contain mi.base.texwidth
-			openinlined_ = textdim_.wid < 0.5 * mi.base.bv->workWidth();
+			openinlined_ = !hasFixedWidth() 
+				&& textdim_.wid < 0.5 * mi.base.bv->workWidth();
 			if (openinlined_) {
 				// Correct for button width, and re-fit
 				mi.base.textwidth -= dim.wid;
@@ -162,7 +180,16 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 	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;
+}
+
+
+bool InsetCollapsable::setMouseHover(bool mouse_hover)
+{
+	mouse_hover_ = mouse_hover;
+	return true;
 }
 
 
@@ -179,7 +206,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 		button_dim.y1 = top;
 		button_dim.y2 = top + dimc.height();
 
-		pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
+		pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_, mouse_hover_);
 
 		if (status() == Open) {
 			int textx, texty;
@@ -279,7 +306,7 @@ void InsetCollapsable::edit(LCursor & cur, bool left)
 InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 {
 	//lyxerr << "InsetCollapsable: edit xy" << endl;
-	if (status() == Collapsed)
+	if (status() == Collapsed || (button_dim.contains(x, y) && status() != Inlined))
 		return this;
 	cur.push(*this);
 	return InsetText::editXY(cur, x, y);
@@ -293,9 +320,13 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 
 	switch (cmd.action) {
 	case LFUN_MOUSE_PRESS:
-		if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+		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();
-			cur.noUpdate();
 			break;
 		}
 		if (status() == Inlined)
@@ -331,8 +362,12 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 		}
 
 		if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
-			// Left button is clicked, the user asks to toggle the inset
-			// visual state.
+			// 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) {
@@ -347,7 +382,8 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 		}
 
 		// The mouse click is within the opened inset.
-		InsetText::doDispatch(cur, cmd);
+		if (status() == Open)
+			InsetText::doDispatch(cur, cmd);
 		break;
 
 	case LFUN_INSET_TOGGLE: