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 cce32e334f61c8490c0d451729c56abeb8381992..ed6e26b51e6d1d8c7bb9fd71ad0afaa351c823fd 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"
@@ -21,60 +20,54 @@
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-
 
 RenderButton::RenderButton()
-       : editable_(false)
+       : editable_(false), inherit_font_(false)
 {}
 
 
-auto_ptr<RenderBase> RenderButton::clone(InsetBase const *) const
+RenderBase * RenderButton::clone(Inset const *) const
 {
-       return auto_ptr<RenderBase>(new RenderButton(*this));
+       return new RenderButton(*this);
 }
 
 
-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;
 }
 
 
-bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void RenderButton::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       FontInfo font = inherit_font_ ? mi.base.font : sane_font;
        font.decSize();
-       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);
-
-       dim.wid += 4;
-       if (dim_ == dim)
-               return false;
+       frontend::FontMetrics const & fm = theFontMetrics(font);
+
+       fm.buttonText(text_, Inset::TEXT_TO_INSET_OFFSET, dim.wid, dim.asc, dim.des);
+
        dim_ = dim;
-       return true;
 }
 
 
 void RenderButton::draw(PainterInfo & pi, int x, int y) const
 {
        // Draw it as a box with the LaTeX text
-       LyXFont font(LyXFont::ALL_SANE);
-       font.setColor(Color::command);
+       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);
        }
 }