X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderButton.cpp;h=c5bc4af87bf1bda2212872d6537d1e3d951048a3;hb=eb294eadb5e7f22880da399ae082f74567bbfc4e;hp=430b8dd53c1b94d43fd4452c1c965fa1fdebd3b1;hpb=3f34ebbaf932ea645e584a17d643c9b7f19b2a86;p=lyx.git

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index 430b8dd53c..c5bc4af87b 100644
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -22,7 +22,7 @@ namespace lyx {
 
 
 RenderButton::RenderButton()
-	: editable_(false), inherit_font_(false)
+	: editable_(false), broken_(false), inherit_font_(false)
 {}
 
 
@@ -32,41 +32,48 @@ RenderBase * RenderButton::clone(Inset const *) const
 }
 
 
-void RenderButton::update(docstring const & text, bool editable)
+void RenderButton::update(docstring const & text, bool editable,
+                          bool inherit, bool broken)
 {
 	text_ = text;
 	editable_ = editable;
+	inherit_font_ = inherit;
+	broken_ = broken;
 }
 
 
-void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontInfo font = sane_font;
+	FontInfo font = inherit_font_ ? mi.base.font : sane_font;
 	font.decSize();
-	frontend::FontMetrics const & fm =
-		theFontMetrics(font);
+	frontend::FontMetrics const & fm = theFontMetrics(font);
 
-	if (editable_)
-		fm.buttonText(text_, dim.wid, dim.asc, dim.des);
-	else
-		fm.rectText(text_, dim.wid, dim.asc, dim.des);
+	fm.buttonText(text_, Inset::textOffset(mi.base.bv), dim.wid, dim.asc, dim.des);
 
 	dim_ = dim;
 }
 
 
-void RenderButton::draw(PainterInfo & pi, int x, int y) const
+void RenderButton::draw(PainterInfo & pi, int x, int y, bool) const
 {
 	// Draw it as a box with the LaTeX text
-	FontInfo font = sane_font;
+	FontInfo font = inherit_font_ ? pi.base.font : sane_font;
 	font.setColor(Color_command);
 	font.decSize();
 
-	if (editable_) {
-		pi.pain.buttonText(x, y, text_, font, renderState());
+	if (broken_) {
+		font.setColor(Color_command_broken);
+		pi.pain.buttonText(x, y, text_, font,
+				   renderState() ? Color_buttonhoverbg_broken : Color_buttonbg_broken,
+				   Color_buttonframe_broken, Inset::textOffset(pi.base.bv));
+	} else if (editable_) {
+		pi.pain.buttonText(x, y, text_, font,
+		                   renderState() ? Color_buttonhoverbg : Color_buttonbg,
+		                   Color_buttonframe, Inset::textOffset(pi.base.bv));
 	} else {
-		pi.pain.rectText(x, y, text_, font,
-				 Color_commandbg, Color_commandframe);
+		pi.pain.buttonText(x, y, text_, font,
+		                   Color_commandbg, Color_commandframe,
+		                   Inset::textOffset(pi.base.bv));
 	}
 }