X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderButton.cpp;h=06fc653da731ae3cb8d7a2c8f062aecc7606a636;hb=3588f2f69675df8dbf829800b0ed6e4a455c68b4;hp=3e151e46590206fce3049f12cd7210a035c6f246;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index 3e151e4659..06fc653da7 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"
@@ -21,18 +20,15 @@
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-
 
 RenderButton::RenderButton()
 	: editable_(false)
 {}
 
 
-auto_ptr<RenderBase> RenderButton::clone(Inset const *) const
+RenderBase * RenderButton::clone(Inset const *) const
 {
-	return auto_ptr<RenderBase>(new RenderButton(*this));
+	return new RenderButton(*this);
 }
 
 
@@ -43,38 +39,35 @@ void RenderButton::update(docstring const & text, bool editable)
 }
 
 
-bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 {
-	LyXFont font(LyXFont::ALL_SANE);
+	FontInfo font = sane_font;
 	font.decSize();
 	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);
 
-	dim.wid += 4;
-	if (dim_ == dim)
-		return false;
+	dim.wid += 2;
 	dim_ = dim;
-	return true;
 }
 
 
 void RenderButton::draw(PainterInfo & pi, int x, int y) const
 {
 	// Draw it as a box with the LaTeX text
-	LyXFont font(LyXFont::ALL_SANE);
-	font.setColor(Color::command);
+	FontInfo font = sane_font;
+	font.setColor(Color_command);
 	font.decSize();
 
 	if (editable_) {
-		pi.pain.buttonText(x + 2, y, text_, font, renderState());
+		pi.pain.buttonText(x + 1, y, text_, font, renderState());
 	} else {
-		pi.pain.rectText(x + 2, y, text_, font,
-				 Color::commandbg, Color::commandframe);
+		pi.pain.rectText(x + 1, y, text_, font,
+				 Color_commandbg, Color_commandframe);
 	}
 }