Do not forget to set cursor current font when selecting

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 3f18724cb72313e23df648116519c42f1317f69d..2a18cf8cffdc11fbc47b9363a2549955e2cdfd8a 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -20,6 +20,8 @@
 #include "support/strfwd.h"
 #include "support/Changer.h"
 
+#include "insets/Inset.h"
+
 
 #include <string>
 
@@ -28,54 +30,49 @@ namespace lyx {
 
 namespace frontend { class Painter; }
 class BufferView;
-class Inset;
 class MacroContext;
 
 
-/// Standard Sizes (mode styles)
-/// note: These values are hard-coded in changeStyle
-enum Styles {
-       ///
-       LM_ST_DISPLAY = 0,
-       ///
-       LM_ST_TEXT,
-       ///
-       LM_ST_SCRIPT,
-       ///
-       LM_ST_SCRIPTSCRIPT
-};
-
-
 //
 // This is the part common to MetricsInfo and PainterInfo
 //
 class MetricsBase {
 public:
        ///
-       MetricsBase();
-       ///
-       MetricsBase(BufferView * bv, FontInfo const & font, int textwidth);
+       MetricsBase(BufferView * bv = 0, FontInfo font = FontInfo(),
+                   int textwidth = 0);
 
        /// the current view
        BufferView * bv;
        /// current font
        FontInfo font;
-       /// current math style (display/text/script/..)
-       Styles style;
        /// name of current font - mathed specific
        std::string fontname;
        /// This is the width available in pixels
        int textwidth;
+       /// count wether the current mathdata is nested in macro(s)
+       int macro_nesting;
 
        /// Temporarily change a full font.
-       Changer changeFontSet(docstring const & font, bool cond = true);
-       Changer changeFontSet(char const * font, bool cond = true);
-       /// Temporarily change the font size and the math style.
-       Changer changeStyle(Styles style, bool cond = true);
+       Changer changeFontSet(std::string const & font);
+       /// Temporarily change the font to math if needed.
+       Changer changeEnsureMath(Inset::mode_type mode = Inset::MATH_MODE);
        // Temporarily change to the style suitable for use in fractions
-       Changer changeFrac(bool cond = true);
+       Changer changeFrac();
+       // Temporarily change to the style suitable for use in arrays
+       Changer changeArray();
        // Temporarily change the style to (script)script style
-       Changer changeScript(bool cond = true);
+       Changer changeScript();
+       ///
+       int solidLineThickness() const { return solid_line_thickness_; }
+       ///
+       int solidLineOffset() const { return solid_line_offset_; }
+       ///
+       int dottedLineThickness() const { return dotted_line_thickness_; }
+private:
+       int solid_line_thickness_;
+       int solid_line_offset_;
+       int dotted_line_thickness_;
 };
 
 
@@ -88,7 +85,8 @@ public:
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
+       MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
+                   MacroContext const & mc);
 
        ///
        MetricsBase base;
@@ -110,13 +108,13 @@ public:
        ///
        void draw(int x, int y, docstring const & str);
        /// Determines the background color for the specified inset based on the
-       /// selection state, the background color inherited from the parent inset 
+       /// selection state, the background color inherited from the parent inset
        /// and the inset's own background color.
        /// \param sel whether to take the selection state into account
        ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
 
        /// Determines the text color based on the intended color, the
-       /// change tracking state and the selection state. 
+       /// change tracking state and the selection state.
        /// \param color what the color should be by default
        Color textColor(Color const & color) const;