Update sk.po

[features.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 93c6e396f1a8ced06d2aca52f02e2403d3fedc0c..92ed4a7eb3e273beb4ca44a888400e08c205be59 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -10,11 +10,10 @@
 
 #include <config.h>
 
-#include "BufferView.h"
-#include "ColorSet.h"
-#include "LyXRC.h"
 #include "MetricsInfo.h"
 
+#include "LyXRC.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/MathSupport.h"
@@ -22,10 +21,6 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/docstring.h"
-#include "support/lassert.h"
-#include "support/RefChanger.h"
-
 using namespace std;
 
 
@@ -38,7 +33,7 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////////
 
 MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
-       : bv(b), font(move(f)), fontname("mathnormal"),
+       : bv(b), font(std::move(f)), fontname("mathnormal"),
          textwidth(w), macro_nesting(0),
          solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
 {
@@ -70,15 +65,17 @@ Changer MetricsBase::changeFontSet(string const & name)
        augmentFont(font, name);
        font.setSize(rc->old.font.size());
        font.setStyle(rc->old.font.style());
-       if (name != "lyxtex"
+       if (name == "emph") {
+               font.setColor(oldcolor);
+               if (rc->old.font.shape() != UP_SHAPE)
+                       font.setShape(UP_SHAPE);
+               else
+                       font.setShape(ITALIC_SHAPE);
+       } else if (name != "lyxtex"
            && ((isTextFont(oldname) && oldcolor != Color_foreground)
                || (isMathFont(oldname) && oldcolor != Color_math)))
                font.setColor(oldcolor);
-#if __cplusplus >= 201402L
        return rc;
-#else
-       return move(rc);
-#endif
 }
 
 
@@ -86,16 +83,16 @@ Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
 {
        switch (mode) {
        case Inset::UNDECIDED_MODE:
-               return Changer();
+               return noChange();
        case Inset::TEXT_MODE:
-               return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+               return isMathFont(fontname) ? changeFontSet("textnormal") : noChange();
        case Inset::MATH_MODE:
                // FIXME:
                //   \textit{\ensuremath{\text{a}}}
                // should appear in italics
-               return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
+               return isTextFont(fontname) ? changeFontSet("mathnormal"): noChange();
        }
-       return Changer();
+       return noChange();
 }
 
 
@@ -119,8 +116,8 @@ int MetricsBase::inPixels(Length const & len) const
 /////////////////////////////////////////////////////////////////////////
 
 MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
-                         MacroContext const & mc)
-       : base(bv, font, textwidth), macrocontext(mc)
+                         MacroContext const & mc, bool vm, bool tight)
+       : base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight)
 {}
 
 
@@ -131,7 +128,8 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
 /////////////////////////////////////////////////////////////////////////
 
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
-       : pain(painter), ltr_pos(false), change_(), selected(false),
+       : pain(painter), ltr_pos(false), change(),
+         selected(false), selected_left(false), selected_right(false),
          do_spellcheck(true), full_repaint(true), background_color(Color_background),
          leftx(0), rightx(0)
 {
@@ -153,19 +151,21 @@ void PainterInfo::draw(int x, int y, docstring const & str)
 
 ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 {
-       ColorCode const color_bg = inset->backgroundColor(*this);
-
        if (selected && sel)
                // This inset is in a selection
                return Color_selection;
 
-       if (pain.develMode() && !inset->isBufferValid())
-               // This inset is in error
-               return Color_error;
+       // special handling for inset background
+       if (inset != nullptr) {
+               if (pain.develMode() && !inset->isBufferValid())
+                       // This inset is in error
+                       return Color_error;
 
-       if (color_bg != Color_none)
-               // This inset has its own color
-               return color_bg;
+               ColorCode const color_bg = inset->backgroundColor(*this);
+               if (color_bg != Color_none)
+                       // This inset has its own color
+                       return color_bg;
+       }
 
        if (background_color == Color_none)
                // This inset has no own color and does not inherit a color
@@ -178,8 +178,8 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 
 Color PainterInfo::textColor(Color const & color) const
 {
-       if (change_.changed())
-               return change_.color();
+       if (change.changed())
+               return change.color();
        if (selected)
                return Color_selectiontext;
        return color;
@@ -197,10 +197,10 @@ Changer MetricsBase::changeScript()
                return font.changeStyle(SCRIPTSCRIPT_STYLE);
        case INHERIT_STYLE:
        case IGNORE_STYLE:
-               return Changer();
+               return noChange();
        }
        //remove Warning
-       return Changer();
+       return noChange();
 }
 
 
@@ -216,10 +216,10 @@ Changer MetricsBase::changeFrac()
                return font.changeStyle(SCRIPTSCRIPT_STYLE);
        case INHERIT_STYLE:
        case IGNORE_STYLE:
-               return Changer();
+               return noChange();
        }
        //remove Warning
-       return Changer();
+       return noChange();
 }
 
 
@@ -228,7 +228,7 @@ Changer MetricsBase::changeArray(bool small)
        if (small)
                return font.changeStyle(SCRIPT_STYLE);
        return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
-               : Changer();
+               : noChange();
 }