Don't remove cell selections after fontchange.

[lyx.git] / src / insets / insetbutton.C

diff --git a/src/insets/insetbutton.C b/src/insets/insetbutton.C
index 4871739fdaed35b3a3dcac4c3a63fd2cc031e6cb..b171dc91012285ed9dea6f930bd58abfe237ddad 100644 (file)
--- a/src/insets/insetbutton.C
+++ b/src/insets/insetbutton.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 2000 The LyX Team.
+ *          Copyright 2000-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -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);
 }