By default, charstyles should not permit layout changes internally.

[lyx.git] / src / insets / RenderButton.cpp

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index f1ae80043005ca11a6110647fa4bf51169a912a3..ee1b1f44cd04326aafa2ae8d631873cb9520622b 100644 (file)
--- 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"
@@ -40,9 +39,9 @@ void RenderButton::update(docstring const & text, bool editable)
 }
 
 
-bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 {
-       Font font(Font::ALL_SANE);
+       FontInfo font = sane_font;
        font.decSize();
        frontend::FontMetrics const & fm =
                theFontMetrics(font);
@@ -52,26 +51,22 @@ bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
        else
                fm.rectText(text_, dim.wid, dim.asc, dim.des);
 
-       dim.wid += 4;
-       if (dim_ == dim)
-               return false;
        dim_ = dim;
-       return true;
 }
 
 
 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 = 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());
        } else {
-               pi.pain.rectText(x + 2, y, text_, font,
-                                Color::commandbg, Color::commandframe);
+               pi.pain.rectText(x, y, text_, font,
+                                Color_commandbg, Color_commandframe);
        }
 }