Keep dialog connected to cross-ref inset after Apply.

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 3ad59cd4c63bd401223fca7a305c9484c1375055..14fd02642a46e95a9518c1f743c712a801e29529 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -55,7 +55,7 @@ public:
        int macro_nesting;
 
        /// Temporarily change a full font.
-       Changer changeFontSet(std::string const & font);
+       Changer changeFontSet(std::string const & name);
        /// 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
@@ -95,12 +95,14 @@ public:
        MetricsInfo();
        ///
        MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
-                   MacroContext const & mc);
+                   MacroContext const & mc, bool vm);
 
        ///
        MetricsBase base;
        /// The context to resolve macros
        MacroContext const & macrocontext;
+       /// Are we at the start of a paragraph (vertical mode)?
+       bool vmode;
 };
 
 
@@ -116,11 +118,11 @@ public:
        void draw(int x, int y, char_type c);
        ///
        void draw(int x, int y, docstring const & str);
-       /// Determines the background color for the specified inset based on the
+       /// Determines the background color based on the
        /// selection state, the background color inherited from the parent inset
-       /// and the inset's own background color.
+       /// and the inset's own background color (if one is specified).
        /// \param sel whether to take the selection state into account
-       ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
+       ColorCode backgroundColor(Inset const * inset = nullptr, bool sel = true) const;
 
        /// Determines the text color based on the intended color, the
        /// change tracking state and the selection state.