X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=589e9241a955be42378551383955df099f23875e;hb=3d7ede605978461a6bd67b250925fcc8bf8404c3;hp=c2ed3cf094617e9e53578ca2c460990fab85bd7d;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index c2ed3cf094..589e9241a9 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -11,47 +11,95 @@ #include #include "BufferView.h" -#include "Color.h" +#include "ColorSet.h" +#include "LyXRC.h" #include "MetricsInfo.h" +#include "insets/Inset.h" + #include "mathed/MathSupport.h" #include "frontends/Painter.h" -#include - +#include "support/docstring.h" +#include "support/lassert.h" +#include "support/RefChanger.h" -namespace lyx { +using namespace std; -using std::string; - - -MetricsBase::MetricsBase() - : bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"), - textwidth(0) -{} +namespace lyx { -MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w) - : bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"), - textwidth(w) -{} +///////////////////////////////////////////////////////////////////////// +// +// MetricsBase +// +///////////////////////////////////////////////////////////////////////// + +MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w) + : bv(b), font(move(f)), style(LM_ST_TEXT), fontname("mathnormal"), + textwidth(w), solid_line_thickness_(1), solid_line_offset_(1), + dotted_line_thickness_(1) +{ + if (lyxrc.zoom >= 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; + // adjust line_offset_ too + solid_line_offset_ = 1 + solid_line_thickness_ / 2; + } + if (lyxrc.zoom >= 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; + } +} +Changer MetricsBase::changeFontSet(string const & name, bool cond) +{ + RefChanger rc = make_save(*this); + if (!cond) + rc->keep(); + else { + ColorCode oldcolor = font.color(); + string const oldname = fontname; + fontname = name; + font = sane_font; + augmentFont(font, name); + font.setSize(rc->old.font.size()); + if (name != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + font.setColor(oldcolor); + } + return move(rc); +} -MetricsInfo::MetricsInfo() -{} +///////////////////////////////////////////////////////////////////////// +// +// MetricsInfo +// +///////////////////////////////////////////////////////////////////////// -MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth) - : base(bv, font, textwidth) +MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth, + MacroContext const & mc) + : base(bv, font, textwidth), macrocontext(mc) {} +///////////////////////////////////////////////////////////////////////// +// +// PainterInfo +// +///////////////////////////////////////////////////////////////////////// PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter) - : pain(painter), ltr_pos(false), erased_(false), 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) { base.bv = bv; } @@ -69,151 +117,91 @@ void PainterInfo::draw(int x, int y, docstring const & str) } -Styles smallerScriptStyle(Styles st) +ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const { - switch (st) { - case LM_ST_DISPLAY: - case LM_ST_TEXT: - return LM_ST_SCRIPT; - case LM_ST_SCRIPT: - case LM_ST_SCRIPTSCRIPT: - default: // shut up compiler - return LM_ST_SCRIPTSCRIPT; + ColorCode const color_bg = inset->backgroundColor(*this); + + 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; + } } } -ScriptChanger::ScriptChanger(MetricsBase & mb) - : StyleChanger(mb, smallerScriptStyle(mb.style)) -{} - - -Styles smallerFracStyle(Styles st) +Color PainterInfo::textColor(Color const & color) const { - switch (st) { - case LM_ST_DISPLAY: - return LM_ST_TEXT; - case LM_ST_TEXT: - return LM_ST_SCRIPT; - case LM_ST_SCRIPT: - case LM_ST_SCRIPTSCRIPT: - default: // shut up compiler - return LM_ST_SCRIPTSCRIPT; - } + if (change_.changed()) + return change_.color(); + if (selected) + return Color_selectiontext; + return color; } -FracChanger::FracChanger(MetricsBase & mb) - : StyleChanger(mb, smallerFracStyle(mb.style)) -{} - - - -ArrayChanger::ArrayChanger(MetricsBase & mb) - : StyleChanger(mb, mb.style == LM_ST_DISPLAY ? LM_ST_TEXT : mb.style) -{} - - - -ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape) - : Changer(font) +Changer MetricsBase::changeScript(bool cond) { - save_ = orig_.shape(); - orig_.setShape(shape); + switch (style) { + case LM_ST_DISPLAY: + case LM_ST_TEXT: + return changeStyle(LM_ST_SCRIPT, cond); + case LM_ST_SCRIPT: + case LM_ST_SCRIPTSCRIPT: + return changeStyle(LM_ST_SCRIPTSCRIPT, cond); + } + //remove Warning + LASSERT(false, return Changer()); } -ShapeChanger::~ShapeChanger() +Changer MetricsBase::changeFrac(bool cond) { - orig_.setShape(save_); + switch (style) { + case LM_ST_DISPLAY: + return changeStyle(LM_ST_TEXT, cond); + case LM_ST_TEXT: + return changeStyle(LM_ST_SCRIPT, cond); + case LM_ST_SCRIPT: + case LM_ST_SCRIPTSCRIPT: + return changeStyle(LM_ST_SCRIPTSCRIPT, cond); + } + //remove Warning + return Changer(); } - -StyleChanger::StyleChanger(MetricsBase & mb, Styles style) - : Changer(mb) +Changer MetricsBase::changeStyle(Styles new_style, bool cond) { static const int diff[4][4] = { { 0, 0, -3, -5 }, { 0, 0, -3, -5 }, { 3, 3, 0, -2 }, { 5, 5, 2, 0 } }; - save_ = mb; - int t = diff[mb.style][style]; - if (t > 0) - while (t--) - mb.font.incSize(); - else - while (t++) - mb.font.decSize(); - mb.style = style; -} - - -StyleChanger::~StyleChanger() -{ - orig_ = save_; -} - - - -FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name) - : Changer(mb) -{ - save_ = mb; - FontSize oldsize = save_.font.size(); - mb.fontname = name; - mb.font = FontInfo(); - augmentFont(mb.font, from_ascii(name)); - mb.font.setSize(oldsize); -} - - -FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name) - : Changer(mb) -{ - save_ = mb; - FontSize oldsize = save_.font.size(); - mb.fontname = to_utf8(name); - mb.font = FontInfo(); - augmentFont(mb.font, name); - mb.font.setSize(oldsize); -} - - -FontSetChanger::~FontSetChanger() -{ - orig_ = save_; -} - - -WidthChanger::WidthChanger(MetricsBase & mb, int w) - : Changer(mb) -{ - save_ = mb; - mb.textwidth = w; -} - - -WidthChanger::~WidthChanger() -{ - orig_ = save_; -} - - - - -ColorChanger::ColorChanger(FontInfo & font, string const & color) - : Changer(font) -{ - save_ = lcolor.getFromLyXName(color); - font.setColor(lcolor.getFromLyXName(color)); -} - - -ColorChanger::~ColorChanger() -{ - orig_.setColor(lcolor.getFromLyXName(save_)); + int t = diff[style][new_style]; + RefChanger rc = make_save(*this); + if (!cond) + rc->keep(); + else { + if (t > 0) + while (t--) + font.incSize(); + else + while (t++) + font.decSize(); + style = new_style; + } + return move(rc); }