Fix Qt deprecation warns for setAutoCompletion()

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 3f2b13bc6da5c82dac223779d9372042a539f462..537efd351b875b086b091914f32b7c2ae19ae1e7 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"
@@ -41,19 +42,19 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
          textwidth(w), macro_nesting(0),
          solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
 {
-       if (lyxrc.zoom >= 200) {
+       if (lyxrc.currentZoom >= 200) {
                // derive the line thickness from zoom factor
                // the zoom is given in percent
                // (increase thickness at 250%, 450% etc.)
-               solid_line_thickness_ = (lyxrc.zoom + 150) / 200;
+               solid_line_thickness_ = (lyxrc.currentZoom + 150) / 200;
                // adjust line_offset_ too
                solid_line_offset_ = 1 + solid_line_thickness_ / 2;
        }
-       if (lyxrc.zoom >= 100) {
+       if (lyxrc.currentZoom >= 100) {
                // derive the line thickness from zoom factor
                // the zoom is given in percent
                // (increase thickness at 150%, 250% etc.)
-               dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
+               dotted_line_thickness_ = (lyxrc.currentZoom + 50) / 100;
        }
 }
 
@@ -73,7 +74,41 @@ 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
+}
+
+
+Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
+{
+       switch (mode) {
+       case Inset::UNDECIDED_MODE:
+               return Changer();
+       case Inset::TEXT_MODE:
+               return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+       case Inset::MATH_MODE:
+               // FIXME:
+               //   \textit{\ensuremath{\text{a}}}
+               // should appear in italics
+               return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
+       }
+       return Changer();
+}
+
+
+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());
 }
 
 
@@ -96,8 +131,9 @@ 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)
+       : pain(painter), ltr_pos(false), change(), selected(false),
+         do_spellcheck(true), full_repaint(true), background_color(Color_background),
+         leftx(0), rightx(0)
 {
        base.bv = bv;
 }
@@ -122,26 +158,28 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
        if (selected && sel)
                // This inset is in a selection
                return Color_selection;
-       else {
-               if (color_bg != Color_none)
-                       // This inset has its own color
-                       return color_bg;
-               else {
-                       if (background_color == Color_none)
-                               // This inset has no own color and does not inherit a color
-                               return Color_background;
-                       else
-                               // This inset has no own color, but inherits a color
-                               return background_color;
-               }
-       }
+
+       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;
+
+       if (background_color == Color_none)
+               // This inset has no own color and does not inherit a color
+               return Color_background;
+
+       // This inset has no own color, but inherits a color
+       return background_color;
 }
 
 
 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;
@@ -151,12 +189,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();
@@ -166,22 +207,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();
 }