Fix trailing whitespace in cpp files.

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

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index 9d080b8df747280ff186646094bb8afd94768e67..ed6e26b51e6d1d8c7bb9fd71ad0afaa351c823fd 100644 (file)
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -22,7 +22,7 @@ namespace lyx {
 
 
 RenderButton::RenderButton()
-       : editable_(false)
+       : editable_(false), inherit_font_(false)
 {}
 
 
@@ -32,26 +32,23 @@ RenderBase * RenderButton::clone(Inset const *) const
 }
 
 
-void RenderButton::update(docstring const & text, bool editable)
+void RenderButton::update(docstring const & text, bool editable,
+                          bool inherit_font)
 {
        text_ = text;
        editable_ = editable;
+       inherit_font_ = inherit_font;
 }
 
 
-void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontInfo font = sane_font;
+       FontInfo font = inherit_font_ ? mi.base.font : sane_font;
        font.decSize();
-       frontend::FontMetrics const & fm =
-               theFontMetrics(font);
+       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);
+       fm.buttonText(text_, Inset::TEXT_TO_INSET_OFFSET, dim.wid, dim.asc, dim.des);
 
-       dim.wid += 4;
        dim_ = dim;
 }
 
@@ -59,15 +56,18 @@ void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 void RenderButton::draw(PainterInfo & pi, int x, int y) const
 {
        // Draw it as a box with the LaTeX text
-       FontInfo font = sane_font;
+       FontInfo font = inherit_font_ ? pi.base.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() ? Color_buttonhoverbg : Color_buttonbg,
+                                  Color_buttonframe, Inset::TEXT_TO_INSET_OFFSET);
        } else {
-               pi.pain.rectText(x + 2, y, text_, font,
-                                Color_commandbg, Color_commandframe);
+               pi.pain.buttonText(x, y, text_, font,
+                                  Color_commandbg, Color_commandframe,
+                                  Inset::TEXT_TO_INSET_OFFSET);
        }
 }