X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FRenderButton.cpp;h=ed6e26b51e6d1d8c7bb9fd71ad0afaa351c823fd;hb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;hp=2656bd453da578c310d1b3aa41ba535f8521688a;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index 2656bd453d..ed6e26b51e 100644
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -12,7 +12,6 @@
 
 #include "RenderButton.h"
 
-#include "Color.h"
 #include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
@@ -23,7 +22,7 @@ namespace lyx {
 
 
 RenderButton::RenderButton()
-	: editable_(false)
+	: editable_(false), inherit_font_(false)
 {}
 
 
@@ -33,26 +32,23 @@ RenderBase * RenderButton::clone(Inset const *) const
 }
 
 
-void RenderButton::update(docstring const & text, bool editable)
+void RenderButton::update(docstring const & text, bool editable,
+                          bool inherit_font)
 {
 	text_ = text;
 	editable_ = editable;
+	inherit_font_ = inherit_font;
 }
 
 
-void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	Font font(Font::ALL_SANE);
+	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::TEXT_TO_INSET_OFFSET, dim.wid, dim.asc, dim.des);
 
-	dim.wid += 4;
 	dim_ = dim;
 }
 
@@ -60,15 +56,18 @@ void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 void RenderButton::draw(PainterInfo & pi, int x, int y) const
 {
 	// Draw it as a box with the LaTeX text
-	Font font(Font::ALL_SANE);
-	font.setColor(Color::command);
+	FontInfo font = inherit_font_ ? pi.base.font : sane_font;
+	font.setColor(Color_command);
 	font.decSize();
 
 	if (editable_) {
-		pi.pain.buttonText(x + 2, y, text_, font, renderState());
+		pi.pain.buttonText(x, y, text_, font,
+		                   renderState() ? Color_buttonhoverbg : Color_buttonbg,
+		                   Color_buttonframe, Inset::TEXT_TO_INSET_OFFSET);
 	} else {
-		pi.pain.rectText(x + 2, y, text_, font,
-				 Color::commandbg, Color::commandframe);
+		pi.pain.buttonText(x, y, text_, font,
+		                   Color_commandbg, Color_commandframe,
+		                   Inset::TEXT_TO_INSET_OFFSET);
 	}
 }