adjust

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index a0fa1623849bfbe47a166e113c7e5d503c10d850..055b172732dc1438237685fd205f96770d20ecbd 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -12,7 +12,7 @@
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
-#include "LyXFont.h"
+#include "Font.h"
 #include "support/docstring.h"
 #include <string>
 
@@ -44,12 +44,12 @@ public:
        ///
        MetricsBase();
        ///
-       MetricsBase(BufferView * bv, LyXFont const & font, int textwidth);
+       MetricsBase(BufferView * bv, Font const & font, int textwidth);
 
        /// the current view
        BufferView * bv;
        /// current font
-       LyXFont font;
+       Font font;
        /// current math style (display/text/script/..)
        Styles style;
        /// name of current font - mathed specific
@@ -68,7 +68,7 @@ public:
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth);
+       MetricsInfo(BufferView * bv, Font const & font, int textwidth);
 
        ///
        MetricsBase base;
@@ -96,6 +96,10 @@ public:
        bool ltr_pos;
        /// Whether the parent is deleted (change tracking)
        bool erased_;
+       ///
+       bool full_repaint;
+       ///
+       int background_color;
 };
 
 class TextMetricsInfo {};
@@ -147,10 +151,10 @@ protected:
 
 
 // temporarily change some aspect of a font
-class FontChanger : public Changer<LyXFont> {
+class FontChanger : public Changer<Font> {
 public:
        ///
-       FontChanger(LyXFont & orig, docstring const & font);
+       FontChanger(Font & orig, docstring const & font);
        FontChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontChanger();
@@ -204,10 +208,10 @@ public:
 
 
 // temporarily change the shape of a font
-class ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+class ShapeChanger : public Changer<Font, Font::FONT_SHAPE> {
 public:
        ///
-       ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape);
+       ShapeChanger(Font & font, Font::FONT_SHAPE shape);
        ///
        ~ShapeChanger();
 };
@@ -225,10 +229,10 @@ public:
 
 
 // temporarily change the used color
-class ColorChanger : public Changer<LyXFont, std::string> {
+class ColorChanger : public Changer<Font, std::string> {
 public:
        ///
-       ColorChanger(LyXFont & font, std::string const & color);
+       ColorChanger(Font & font, std::string const & color);
        ///
        ~ColorChanger();
 };