&& ((isTextFont(oldname) && oldcolor != Color_foreground)
|| (isMathFont(oldname) && oldcolor != Color_math)))
font.setColor(oldcolor);
+#if __cplusplus >= 201402L
return rc;
+#else
+ return move(rc);
+#endif
}
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());
}
/////////////////////////////////////////////////////////////////////////
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;
}
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;
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:
+ 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
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:
+ 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
}
-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();
}