Constify

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 60a004573e2d3d61c1c4bc3d4fe71d077f32a8b0..e7bbefbf0dbe62beb36b1efcbf967e8027469e17 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -19,6 +19,7 @@
 
 #include "mathed/MathSupport.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "support/docstring.h"
@@ -73,7 +74,11 @@ Changer MetricsBase::changeFontSet(string const & name)
            && ((isTextFont(oldname) && oldcolor != Color_foreground)
                || (isMathFont(oldname) && oldcolor != Color_math)))
                font.setColor(oldcolor);
+#if __cplusplus >= 201402L
+       return rc;
+#else
        return move(rc);
+#endif
 }
 
 
@@ -94,6 +99,19 @@ Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
 }
 
 
+int MetricsBase::inPixels(Length const & len) const
+{
+       FontInfo fi = font;
+       if (len.unit() == Length::MU)
+               // mu is 1/18th of an em in the math symbol font
+               fi.setFamily(SYMBOL_FAMILY);
+       else
+               // Math style is only taken into account in the case of mu
+               fi.setStyle(TEXT_STYLE);
+       return len.inPixels(textwidth, theFontMetrics(fi).em());
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // MetricsInfo
@@ -114,7 +132,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),
-       do_spellcheck(true), full_repaint(true), background_color(Color_background)
+         do_spellcheck(true), full_repaint(true), background_color(Color_background),
+         leftx(0), rightx(0)
 {
        base.bv = bv;
 }
@@ -168,12 +187,15 @@ Color PainterInfo::textColor(Color const & color) const
 Changer MetricsBase::changeScript()
 {
        switch (font.style()) {
-       case LM_ST_DISPLAY:
-       case LM_ST_TEXT:
-               return font.changeStyle(LM_ST_SCRIPT);
-       case LM_ST_SCRIPT:
-       case LM_ST_SCRIPTSCRIPT:
-               return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+       case DISPLAY_STYLE:
+       case TEXT_STYLE:
+               return font.changeStyle(SCRIPT_STYLE);
+       case SCRIPT_STYLE:
+       case SCRIPTSCRIPT_STYLE:
+               return font.changeStyle(SCRIPTSCRIPT_STYLE);
+       case INHERIT_STYLE:
+       case IGNORE_STYLE:
+               return Changer();
        }
        //remove Warning
        return Changer();
@@ -183,22 +205,27 @@ Changer MetricsBase::changeScript()
 Changer MetricsBase::changeFrac()
 {
        switch (font.style()) {
-       case LM_ST_DISPLAY:
-               return font.changeStyle(LM_ST_TEXT);
-       case LM_ST_TEXT:
-               return font.changeStyle(LM_ST_SCRIPT);
-       case LM_ST_SCRIPT:
-       case LM_ST_SCRIPTSCRIPT:
-               return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+       case DISPLAY_STYLE:
+               return font.changeStyle(TEXT_STYLE);
+       case TEXT_STYLE:
+               return font.changeStyle(SCRIPT_STYLE);
+       case SCRIPT_STYLE:
+       case SCRIPTSCRIPT_STYLE:
+               return font.changeStyle(SCRIPTSCRIPT_STYLE);
+       case INHERIT_STYLE:
+       case IGNORE_STYLE:
+               return Changer();
        }
        //remove Warning
        return Changer();
 }
 
 
-Changer MetricsBase::changeArray()
+Changer MetricsBase::changeArray(bool small)
 {
-       return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
+       if (small)
+               return font.changeStyle(SCRIPT_STYLE);
+       return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
                : Changer();
 }