X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbutton.C;h=b171dc91012285ed9dea6f930bd58abfe237ddad;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=70d30aa92bb4158fc9ea17393c5f7d5ff8c0f10b;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git

diff --git a/src/insets/insetbutton.C b/src/insets/insetbutton.C
index 70d30aa92b..b171dc9101 100644
--- a/src/insets/insetbutton.C
+++ b/src/insets/insetbutton.C
@@ -19,6 +19,8 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "support/LAssert.h"
+#include "lyxfont.h"
+#include "font.h"
 
 using std::ostream;
 using std::endl;
@@ -34,16 +36,14 @@ int InsetButton::ascent(BufferView * bv, LyXFont const &) const
 	int width;
 	int ascent;
 	int descent;
-        string const s = getScreenLabel();
-	
-        if (Editable()) {
-		bv->painter().buttonText(0, 0, s, font,
-					 false, width, ascent, descent);
+        string const s = getScreenLabel(bv->buffer());
+
+        if (editable()) {
+		lyxfont::buttonText(s, font, width, ascent, descent);
 	} else {
-		bv->painter().rectText(0, 0, s, font,
-				       LColor::commandbg, LColor::commandframe,
-				       false, width, ascent, descent);
+		lyxfont::rectText(s, font, width, ascent, descent);
 	}
+
 	return ascent;
 }
 
@@ -58,16 +58,14 @@ int InsetButton::descent(BufferView * bv, LyXFont const &) const
 	int width;
 	int ascent;
 	int descent;
-        string const s = getScreenLabel();
-	
-        if (Editable()) {
-		bv->painter().buttonText(0, 0, s, font,
-					 false, width, ascent, descent);
+        string const s = getScreenLabel(bv->buffer());
+
+        if (editable()) {
+		lyxfont::buttonText(s, font, width, ascent, descent);
 	} else {
-		bv->painter().rectText(0, 0, s, font,
-				   LColor::commandbg, LColor::commandframe,
-				   false, width, ascent, descent);
+		lyxfont::rectText(s, font, width, ascent, descent);
 	}
+
 	return descent;
 }
 
@@ -82,16 +80,14 @@ int InsetButton::width(BufferView * bv, LyXFont const &) const
 	int width;
 	int ascent;
 	int descent;
-        string const s = getScreenLabel();
-	
-        if (Editable()) {
-		bv->painter().buttonText(0, 0, s, font,
-					 false, width, ascent, descent);
+        string const s = getScreenLabel(bv->buffer());
+
+        if (editable()) {
+		lyxfont::buttonText(s, font, width, ascent, descent);
 	} else {
-		bv->painter().rectText(0, 0, s, font,
-				       LColor::commandbg, LColor::commandframe,
-				       false, width, ascent, descent);
+		lyxfont::rectText(s, font, width, ascent, descent);
 	}
+
 	return width + 4;
 }
 
@@ -106,16 +102,14 @@ void InsetButton::draw(BufferView * bv, LyXFont const &,
 	LyXFont font(LyXFont::ALL_SANE);
 	font.setColor(LColor::command).decSize();
 
-	int width;
-	string const s = getScreenLabel();
+	string const s = getScreenLabel(bv->buffer());
 
-	if (Editable()) {
-		pain.buttonText(int(x) + 2, baseline, s, font, true, width);
+	if (editable()) {
+		pain.buttonText(int(x) + 2, baseline, s, font);
 	} else {
 		pain.rectText(int(x) + 2, baseline, s, font,
-			      LColor::commandbg, LColor::commandframe,
-			      true, width);
+			      LColor::commandbg, LColor::commandframe);
 	}
 
-	x += width + 4;
+	x += width(bv, font);
 }