X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCollapsable.cpp;h=d038cfc2813a8a277a2bd713555576c681646885;hb=dae8555234f0e5c8358b91c307d91b219c664617;hp=b57b74b341fb0a7e2e5a261044a8a931b0df62c6;hpb=72a93582b0b68fdecee4a96bb985782e4826382a;p=lyx.git

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index b57b74b341..d038cfc281 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -26,6 +26,7 @@
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "TextClass.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -129,7 +130,7 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 
 docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 {
-	Dimension dim = dimensionCollapsed(bv);
+	Dimension const dim = dimensionCollapsed(bv);
 	if (geometry(bv) == NoButton)
 		return translateIfPossible(getLayout().labelstring());
 	if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des || isOpen(bv))
@@ -172,7 +173,9 @@ void InsetCollapsable::read(Lexer & lex)
 Dimension InsetCollapsable::dimensionCollapsed(BufferView const & bv) const
 {
 	Dimension dim;
-	theFontMetrics(getLayout().labelfont()).buttonText(
+	FontInfo labelfont(getLabelfont());
+	labelfont.realize(sane_font);
+	theFontMetrics(labelfont).buttonText(
 		buttonLabel(bv), dim.wid, dim.asc, dim.des);
 	return dim;
 }
@@ -183,7 +186,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 	auto_open_[mi.base.bv] = mi.base.bv->cursor().isInside(this);
 
 	FontInfo tmpfont = mi.base.font;
-	mi.base.font = getLayout().font();
+	mi.base.font = getFont();
 	mi.base.font.realize(tmpfont);
 
 	BufferView const & bv = *mi.base.bv;
@@ -200,7 +203,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 	case SubLabel: {
 		InsetText::metrics(mi, dim);
 		// consider width of the inset label
-		FontInfo font(getLayout().labelfont());
+		FontInfo font(getLabelfont());
 		font.realize(sane_font);
 		font.decSize();
 		font.decSize();
@@ -252,7 +255,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 	auto_open_[&bv] = bv.cursor().isInside(this);
 
 	FontInfo tmpfont = pi.base.font;
-	pi.base.font = getLayout().font();
+	pi.base.font = getFont();
 	pi.base.font.realize(tmpfont);
 
 	// Draw button first -- top, left or only
@@ -266,7 +269,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 		button_dim.y1 = y - dimc.asc;
 		button_dim.y2 = y + dimc.des;
 
-		FontInfo labelfont = getLayout().labelfont();
+		FontInfo labelfont = getLabelfont();
 		labelfont.setColor(labelColor());
 		pi.pain.buttonText(x, y, buttonLabel(bv), labelfont,
 			mouse_hover_[&bv]);
@@ -333,7 +336,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 
 		// the label below the text. Can be toggled.
 		if (geometry(bv) == SubLabel) {
-			FontInfo font(getLayout().labelfont());
+			FontInfo font(getLabelfont());
 			font.realize(sane_font);
 			font.decSize();
 			font.decSize();
@@ -536,11 +539,9 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 		else if (cmd.argument() == "close")
 			setStatus(cur, Collapsed);
 		else if (cmd.argument() == "toggle" || cmd.argument().empty())
-			if (status_ == Open) {
+			if (status_ == Open)
 				setStatus(cur, Collapsed);
-				if (geometry(cur.bv()) == ButtonOnly)
-					cur.top().forwardPos();
-			} else
+			else
 				setStatus(cur, Open);
 		else // if assign or anything else
 			cur.undispatched();
@@ -584,9 +585,9 @@ void InsetCollapsable::setLabel(docstring const & l)
 
 docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const
 {
-	docstring const label = labelstring_.empty() ? 
-		translateIfPossible(getLayout().labelstring()) : labelstring_;
 	InsetLayout const & il = getLayout();
+	docstring const label = labelstring_.empty() ? 
+		translateIfPossible(il.labelstring()) : labelstring_;
 	if (!il.contentaslabel() || geometry(bv) != ButtonOnly)
 		return label;
 	return getNewLabel(label);
@@ -619,20 +620,35 @@ InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 }
 
 
-docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+string InsetCollapsable::contextMenu(BufferView const & bv, int x,
 	int y) const
 {
+	string context_menu = contextMenuName();
+	string const it_context_menu = InsetText::contextMenuName();
 	if (decoration() == InsetLayout::CONGLOMERATE)
-		return from_ascii("context-conglomerate");
+		return context_menu + ";" + it_context_menu;
+
+	string const ic_context_menu = InsetCollapsable::contextMenuName();
+	if (ic_context_menu != context_menu)
+		context_menu += ";" + ic_context_menu;
 
 	if (geometry(bv) == NoButton)
-		return from_ascii("context-collapsable");
+		return context_menu + ";" + it_context_menu;
 
 	Dimension dim = dimensionCollapsed(bv);
 	if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
-		return from_ascii("context-collapsable");
+		return context_menu;
 
-	return InsetText::contextMenu(bv, x, y);
+	return it_context_menu;
+}
+
+
+string InsetCollapsable::contextMenuName() const
+{
+	if (decoration() == InsetLayout::CONGLOMERATE)
+		return "context-conglomerate";
+	else
+		return "context-collapsable";
 }
 
 } // namespace lyx