X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=589e9241a955be42378551383955df099f23875e;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=011cdc6773239a3426e45a53fdeeebb8ebf34701;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index 011cdc6773..589e9241a9 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -11,7 +11,8 @@ #include #include "BufferView.h" -#include "Color.h" +#include "ColorSet.h" +#include "LyXRC.h" #include "MetricsInfo.h" #include "insets/Inset.h" @@ -21,35 +22,84 @@ #include "frontends/Painter.h" #include "support/docstring.h" - #include "support/lassert.h" +#include "support/RefChanger.h" using namespace std; + namespace lyx { +///////////////////////////////////////////////////////////////////////// +// +// 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; + } +} -MetricsBase::MetricsBase() - : bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"), - textwidth(0) -{} +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); +} -MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w) - : bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"), - textwidth(w) -{} +///////////////////////////////////////////////////////////////////////// +// +// MetricsInfo +// +///////////////////////////////////////////////////////////////////////// -MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, - MacroContext const & mc) +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), selected(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,7 +119,7 @@ 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(); + ColorCode const color_bg = inset->backgroundColor(*this); if (selected && sel) // This inset is in a selection @@ -90,150 +140,68 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const } -Styles smallerScriptStyle(Styles st) +Color PainterInfo::textColor(Color const & color) 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; - } + if (change_.changed()) + return change_.color(); + if (selected) + return Color_selectiontext; + return color; } -ScriptChanger::ScriptChanger(MetricsBase & mb) - : StyleChanger(mb, smallerScriptStyle(mb.style)) -{} - - -Styles smallerFracStyle(Styles st) +Changer MetricsBase::changeScript(bool cond) { - 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; + 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()); } -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) -{ - save_ = orig_.shape(); - orig_.setShape(shape); -} - - -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 = sane_font; - 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 = sane_font; - 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); }