X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=9bab1a32c9b4c2e642696b49a21b226aeaa4b146;hb=1cbac6fcb40d6e0803198624c047769adec2fe09;hp=b33c3683ca585fbeeb3e62e306600fa9959264de;hpb=44e88a4c1324fed447ab5510734c741d18f856c0;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index b33c3683ca..9bab1a32c9 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -10,11 +10,10 @@ #include -#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; @@ -70,11 +65,21 @@ 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 } @@ -82,16 +87,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(); } @@ -103,7 +108,7 @@ int MetricsBase::inPixels(Length const & len) const fi.setFamily(SYMBOL_FAMILY); else // Math style is only taken into account in the case of mu - fi.setStyle(LM_ST_TEXT); + fi.setStyle(TEXT_STYLE); return len.inPixels(textwidth, theFontMetrics(fi).em()); } @@ -115,8 +120,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) + : base(bv, font, textwidth), macrocontext(mc), vmode(vm) {} @@ -127,8 +132,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; } @@ -148,31 +154,35 @@ 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; - else { + + // special handling for inset background + if (inset != nullptr) { + if (pain.develMode() && !inset->isBufferValid()) + // This inset is in error + return Color_error; + + ColorCode const color_bg = inset->backgroundColor(*this); 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 (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; @@ -182,44 +192,46 @@ 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 LM_ST_INHERIT: - case LM_ST_IGNORE: - return Changer(); + 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 noChange(); } //remove Warning - return Changer(); + return noChange(); } 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 LM_ST_INHERIT: - case LM_ST_IGNORE: - return Changer(); + 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 noChange(); } //remove Warning - return Changer(); + return noChange(); } -Changer MetricsBase::changeArray() +Changer MetricsBase::changeArray(bool small) { - return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT) - : Changer(); + if (small) + return font.changeStyle(SCRIPT_STYLE); + return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE) + : noChange(); }