* Painter.h:

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index cd622ced2df9e86a4773b8b913424cf3e597f6fe..840944548e1c6cecc2e776956100b5ee1151dbc6 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -13,13 +13,15 @@
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "support/types.h"
-
+#include "support/docstring.h"
 #include <string>
 
-class Painter;
 class BufferView;
 
+namespace lyx {
+
+namespace frontend { class Painter; }
+
 
 /// Standard Sizes (mode styles)
 enum Styles {
@@ -37,7 +39,8 @@ enum Styles {
 //
 // This is the part common to MetricsInfo and PainterInfo
 //
-struct MetricsBase {
+class MetricsBase {
+public:
        ///
        MetricsBase();
        ///
@@ -60,7 +63,8 @@ struct MetricsBase {
 // This contains a MetricsBase and information that's only relevant during
 // the first phase of the two-phase draw
 //
-struct MetricsInfo {
+class MetricsInfo {
+public:
        ///
        MetricsInfo();
        ///
@@ -75,31 +79,44 @@ struct MetricsInfo {
 // This contains a MetricsBase and information that's only relevant during
 // the second phase of the two-phase draw
 //
-struct PainterInfo {
+class PainterInfo {
+public:
        ///
-       PainterInfo(BufferView * bv, Painter & pain);
+       PainterInfo(BufferView * bv, frontend::Painter & pain);
        ///
-       void draw(int x, int y, char c);
+       void draw(int x, int y, char_type c);
+       ///
+       void draw(int x, int y, docstring const & str);
 
        ///
        MetricsBase base;
        ///
-       Painter & pain;
+       frontend::Painter & pain;
        /// Whether the text at this point is right-to-left (for InsetNewline)
        bool ltr_pos;
+       /// Whether the parent is deleted (change tracking)
+       bool erased_;
 };
 
-struct TextMetricsInfo {};
-
+class TextMetricsInfo {};
 
-struct ViewMetricsInfo
+class ViewMetricsInfo
 {
-       ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2,
-                       int y1, int y2) : p1(p1), p2(p2), y1(y1), y2(y2) {}
-       lyx::pit_type p1;
-       lyx::pit_type p2;
+public:
+       ViewMetricsInfo()
+                       : p1(0), p2(0), y1(0), y2(0), singlepar(false), size(0)
+               {}
+       ViewMetricsInfo(pit_type p1, pit_type p2, int y1, int y2,
+                       bool singlepar, pit_type size)
+                       : p1(p1), p2(p2), y1(y1), y2(y2), singlepar(singlepar), size(size)
+               {}
+
+       pit_type p1;
+       pit_type p2;
        int y1;
        int y2;
+       bool singlepar;
+       pit_type size;
 };
 
 
@@ -107,7 +124,8 @@ struct ViewMetricsInfo
 // The original state gets restored when the Changer is destructed.
 
 template <class Struct, class Temp = Struct>
-struct Changer {
+class Changer {
+public:
        ///
        Changer(Struct & orig) : orig_(orig) {}
 protected:
@@ -120,25 +138,30 @@ protected:
 
 
 // temporarily change some aspect of a font
-struct FontChanger : public Changer<LyXFont> {
+class FontChanger : public Changer<LyXFont> {
+public:
        ///
-       FontChanger(LyXFont & orig, char const * font);
+       FontChanger(LyXFont & orig, docstring const & font);
+       FontChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontChanger();
 };
 
 
 // temporarily change a full font
-struct FontSetChanger : public Changer<MetricsBase> {
+class FontSetChanger : public Changer<MetricsBase> {
+public:
        ///
-       FontSetChanger(MetricsBase & mb, char const * font);
+       FontSetChanger(MetricsBase & mb, docstring const & font);
+       FontSetChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontSetChanger();
 };
 
 
 // temporarily change the style
-struct StyleChanger : public Changer<MetricsBase> {
+class StyleChanger : public Changer<MetricsBase> {
+public:
        ///
        StyleChanger(MetricsBase & mb, Styles style);
        ///
@@ -147,21 +170,24 @@ struct StyleChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style to script style
-struct ScriptChanger : public StyleChanger {
+class ScriptChanger : public StyleChanger {
+public:
        ///
        ScriptChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in fractions
-struct FracChanger : public StyleChanger {
+class FracChanger : public StyleChanger {
+public:
        ///
        FracChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in tabulars and arrays
-struct ArrayChanger : public StyleChanger {
+class ArrayChanger : public StyleChanger {
+public:
        ///
        ArrayChanger(MetricsBase & mb);
 };
@@ -169,7 +195,8 @@ struct ArrayChanger : public StyleChanger {
 
 
 // temporarily change the shape of a font
-struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+class ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+public:
        ///
        ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape);
        ///
@@ -178,8 +205,9 @@ struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
 
 
 // temporarily change the available text width
-struct WidthChanger : public Changer<MetricsBase>
+class WidthChanger : public Changer<MetricsBase>
 {
+public:
        ///
        WidthChanger(MetricsBase & mb, int width);
        ///
@@ -188,11 +216,14 @@ struct WidthChanger : public Changer<MetricsBase>
 
 
 // temporarily change the used color
-struct ColorChanger : public Changer<LyXFont, std::string> {
+class ColorChanger : public Changer<LyXFont, std::string> {
+public:
        ///
        ColorChanger(LyXFont & font, std::string const & color);
        ///
        ~ColorChanger();
 };
 
+} // namespace lyx
+
 #endif