* GuiView.C (updateTab): do not update early if current tab has

[lyx.git] / src / metricsinfo.C

diff --git a/src/metricsinfo.C b/src/metricsinfo.C
index 9e50cd0683bedbecff2e46d2e87e171806a8c206..9544e68883c464c85566db05bda984a00992a269 100644 (file)
--- a/src/metricsinfo.C
+++ b/src/metricsinfo.C
@@ -10,11 +10,18 @@
 
 #include <config.h>
 
-#include "metricsinfo.h"
-#include "mathed/math_support.h"
-#include "frontends/Painter.h"
 #include "BufferView.h"
 #include "LColor.h"
+#include "metricsinfo.h"
+
+#include "mathed/MathSupport.h"
+
+#include "frontends/Painter.h"
+
+#include <boost/assert.hpp>
+
+
+namespace lyx {
 
 using std::string;
 
@@ -25,7 +32,6 @@ MetricsBase::MetricsBase()
 {}
 
 
-
 MetricsBase::MetricsBase(BufferView * b, LyXFont const & f, int w)
        : bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"),
          textwidth(w)
@@ -43,19 +49,25 @@ MetricsInfo::MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth)
 
 
 
-PainterInfo::PainterInfo(BufferView * bv)
-       : pain(bv->painter())
+PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
+       : pain(painter), ltr_pos(false), erased_(false)
 {
        base.bv = bv;
 }
 
 
-void PainterInfo::draw(int x, int y, char c)
+void PainterInfo::draw(int x, int y, char_type c)
 {
        pain.text(x, y, c, base.font);
 }
 
 
+void PainterInfo::draw(int x, int y, docstring const & str)
+{
+       pain.text(x, y, str, base.font);
+}
+
+
 Styles smallerScriptStyle(Styles st)
 {
        switch (st) {
@@ -101,6 +113,7 @@ ArrayChanger::ArrayChanger(MetricsBase & mb)
 {}
 
 
+
 ShapeChanger::ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape)
        : Changer<LyXFont, LyXFont::FONT_SHAPE>(font)
 {
@@ -108,6 +121,7 @@ ShapeChanger::ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape)
        orig_.setShape(shape);
 }
 
+
 ShapeChanger::~ShapeChanger()
 {
        orig_.setShape(save_);
@@ -118,10 +132,11 @@ ShapeChanger::~ShapeChanger()
 StyleChanger::StyleChanger(MetricsBase & mb, Styles style)
        :       Changer<MetricsBase>(mb)
 {
-       static const int diff[4][4]  = { { 0, 0, -3, -5 },
-                                        { 0, 0, -3, -5 },
-                                        { 3, 3,  0, -2 },
-                                        { 5, 5,  2,  0 } };
+       static const int diff[4][4] =
+               { { 0, 0, -3, -5 },
+                 { 0, 0, -3, -5 },
+                 { 3, 3,  0, -2 },
+                 { 5, 5,  2,  0 } };
        save_ = mb;
        int t = diff[mb.style][style];
        if (t > 0)
@@ -148,6 +163,18 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name)
        LyXFont::FONT_SIZE oldsize = save_.font.size();
        mb.fontname = name;
        mb.font = LyXFont();
+       augmentFont(mb.font, from_ascii(name));
+       mb.font.setSize(oldsize);
+}
+
+
+FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name)
+       :       Changer<MetricsBase>(mb)
+{
+       save_ = mb;
+       LyXFont::FONT_SIZE oldsize = save_.font.size();
+       mb.fontname = to_utf8(name);
+       mb.font = LyXFont();
        augmentFont(mb.font, name);
        mb.font.setSize(oldsize);
 }
@@ -187,3 +214,6 @@ ColorChanger::~ColorChanger()
 {
        orig_.setColor(lcolor.getFromLyXName(save_));
 }
+
+
+} // namespace lyx