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 368604e5f0f3490f17b558a3b8f1044d6baf670e..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.
  *
  * ====================================================== */
 
@@ -18,71 +18,76 @@
 #include "debug.h"
 #include "BufferView.h"
 #include "Painter.h"
+#include "support/LAssert.h"
+#include "lyxfont.h"
+#include "font.h"
 
 using std::ostream;
 using std::endl;
 
 
-InsetButton::InsetButton()
-{
-}
-
-int InsetButton::ascent(Painter & pain, LyXFont const &) const
+int InsetButton::ascent(BufferView * bv, LyXFont const &) const
 {
+       lyx::Assert(bv);
+       
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        
-       int width, ascent, descent;
-        string s = getScreenLabel();
-       
-        if (Editable()) {
-               pain.buttonText(0, 0, s, font,
-                               false, width, ascent, descent);
+       int width;
+       int ascent;
+       int descent;
+        string const s = getScreenLabel(bv->buffer());
+
+        if (editable()) {
+               lyxfont::buttonText(s, font, width, ascent, descent);
        } else {
-               pain.rectText(0, 0, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             false, width, ascent, descent);
+               lyxfont::rectText(s, font, width, ascent, descent);
        }
+
        return ascent;
 }
 
 
-int InsetButton::descent(Painter & pain, LyXFont const &) const
+int InsetButton::descent(BufferView * bv, LyXFont const &) const
 {
+       lyx::Assert(bv);
+       
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        
-       int width, ascent, descent;
-        string s = getScreenLabel();
-       
-        if (Editable()) {
-               pain.buttonText(0, 0, s, font,
-                               false, width, ascent, descent);
+       int width;
+       int ascent;
+       int descent;
+        string const s = getScreenLabel(bv->buffer());
+
+        if (editable()) {
+               lyxfont::buttonText(s, font, width, ascent, descent);
        } else {
-               pain.rectText(0, 0, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             false, width, ascent, descent);
+               lyxfont::rectText(s, font, width, ascent, descent);
        }
+
        return descent;
 }
 
 
-int InsetButton::width(Painter & pain, LyXFont const &) const
+int InsetButton::width(BufferView * bv, LyXFont const &) const
 {
+       lyx::Assert(bv);
+
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        
-       int width, ascent, descent;
-        string s = getScreenLabel();
-       
-        if (Editable()) {
-               pain.buttonText(0, 0, s, font,
-                               false, width, ascent, descent);
+       int width;
+       int ascent;
+       int descent;
+        string const s = getScreenLabel(bv->buffer());
+
+        if (editable()) {
+               lyxfont::buttonText(s, font, width, ascent, descent);
        } else {
-               pain.rectText(0, 0, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             false, width, ascent, descent);
+               lyxfont::rectText(s, font, width, ascent, descent);
        }
+
        return width + 4;
 }
 
@@ -90,21 +95,21 @@ int InsetButton::width(Painter & pain, LyXFont const &) const
 void InsetButton::draw(BufferView * bv, LyXFont const &,
                        int baseline, float & x, bool) const
 {
+       lyx::Assert(bv);
+       
        Painter & pain = bv->painter();
        // Draw it as a box with the LaTeX text
        LyXFont font(LyXFont::ALL_SANE);
        font.setColor(LColor::command).decSize();
 
-       int width;
-       string 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);
+               pain.rectText(int(x) + 2, baseline, s, font,
+                             LColor::commandbg, LColor::commandframe);
        }
 
-       x += width + 4;
+       x += width(bv, font);
 }