X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=6d701c75ac1354c15cb0eafaac86d5aced3d1f00;hb=88fa0809788ac231fa9b040ee5fd9883476e4980;hp=514693e4a686f01a85d4c001c840be3e068c5ed5;hpb=eea79637c78bb9916031924eca7b305cfb8e83df;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index 514693e4a6..6d701c75ac 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,20 +11,28 @@ #include #include "BufferView.h" -#include "Color.h" +#include "ColorSet.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" +using namespace std; -namespace lyx { -using std::string; +namespace lyx { +///////////////////////////////////////////////////////////////////////// +// +// MetricsBase +// +///////////////////////////////////////////////////////////////////////// MetricsBase::MetricsBase() : bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"), @@ -32,26 +40,33 @@ MetricsBase::MetricsBase() {} -MetricsBase::MetricsBase(BufferView * b, Font const & f, int w) +MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w) : bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"), textwidth(w) {} +///////////////////////////////////////////////////////////////////////// +// +// MetricsInfo +// +///////////////////////////////////////////////////////////////////////// -MetricsInfo::MetricsInfo() -{} - - -MetricsInfo::MetricsInfo(BufferView * bv, Font const & font, int textwidth) - : base(bv, font, textwidth) +MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & 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), + full_repaint(true), background_color(Color_background) { base.bv = bv; } @@ -69,6 +84,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 { + 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 +// +///////////////////////////////////////////////////////////////////////// + Styles smallerScriptStyle(Styles st) { switch (st) { @@ -82,11 +126,17 @@ Styles smallerScriptStyle(Styles st) } } + ScriptChanger::ScriptChanger(MetricsBase & mb) : StyleChanger(mb, smallerScriptStyle(mb.style)) {} +///////////////////////////////////////////////////////////////////////// +// +// FracChanger +// +///////////////////////////////////////////////////////////////////////// Styles smallerFracStyle(Styles st) { @@ -108,15 +158,25 @@ FracChanger::FracChanger(MetricsBase & mb) {} +///////////////////////////////////////////////////////////////////////// +// +// ArrayChanger +// +///////////////////////////////////////////////////////////////////////// ArrayChanger::ArrayChanger(MetricsBase & mb) : StyleChanger(mb, mb.style == LM_ST_DISPLAY ? LM_ST_TEXT : mb.style) {} +///////////////////////////////////////////////////////////////////////// +// +// ShapeChanger +// +///////////////////////////////////////////////////////////////////////// -ShapeChanger::ShapeChanger(Font & font, Font::FONT_SHAPE shape) - : Changer(font) +ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape) + : Changer(font) { save_ = orig_.shape(); orig_.setShape(shape); @@ -129,9 +189,14 @@ ShapeChanger::~ShapeChanger() } +///////////////////////////////////////////////////////////////////////// +// +// StyleChanger +// +///////////////////////////////////////////////////////////////////////// StyleChanger::StyleChanger(MetricsBase & mb, Styles style) - : Changer(mb) + : Changer(mb) { static const int diff[4][4] = { { 0, 0, -3, -5 }, @@ -156,39 +221,69 @@ StyleChanger::~StyleChanger() } +///////////////////////////////////////////////////////////////////////// +// +// FontSetChanger +// +///////////////////////////////////////////////////////////////////////// -FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name) - : Changer(mb) +FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name, + bool really_change_font) + : Changer(mb), change_(really_change_font) { - save_ = mb; - Font::FONT_SIZE oldsize = save_.font.size(); - mb.fontname = name; - mb.font = Font(); - augmentFont(mb.font, from_ascii(name)); - mb.font.setSize(oldsize); + if (change_) { + save_ = mb; + FontSize oldsize = save_.font.size(); + ColorCode oldcolor = save_.font.color(); + docstring const oldname = from_ascii(save_.fontname); + mb.fontname = name; + mb.font = sane_font; + augmentFont(mb.font, from_ascii(name)); + mb.font.setSize(oldsize); + if (string(name) != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + mb.font.setColor(oldcolor); + } } -FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name) - : Changer(mb) +FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name, + bool really_change_font) + : Changer(mb), change_(really_change_font) { - save_ = mb; - Font::FONT_SIZE oldsize = save_.font.size(); - mb.fontname = to_utf8(name); - mb.font = Font(); - augmentFont(mb.font, name); - mb.font.setSize(oldsize); + if (change_) { + save_ = mb; + FontSize oldsize = save_.font.size(); + ColorCode oldcolor = save_.font.color(); + docstring const oldname = from_ascii(save_.fontname); + mb.fontname = to_utf8(name); + mb.font = sane_font; + augmentFont(mb.font, name); + mb.font.setSize(oldsize); + if (name != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + mb.font.setColor(oldcolor); + } } FontSetChanger::~FontSetChanger() { - orig_ = save_; + if (change_) + orig_ = save_; } +///////////////////////////////////////////////////////////////////////// +// +// WidthChanger +// +///////////////////////////////////////////////////////////////////////// + WidthChanger::WidthChanger(MetricsBase & mb, int w) - : Changer(mb) + : Changer(mb) { save_ = mb; mb.textwidth = w; @@ -201,19 +296,27 @@ WidthChanger::~WidthChanger() } +///////////////////////////////////////////////////////////////////////// +// +// ColorChanger +// +///////////////////////////////////////////////////////////////////////// - -ColorChanger::ColorChanger(Font & font, string const & color) - : Changer(font) +ColorChanger::ColorChanger(FontInfo & font, docstring const & color, + bool really_change_color) + : Changer(font), change_(really_change_color) { - save_ = lcolor.getFromLyXName(color); - font.setColor(lcolor.getFromLyXName(color)); + if (change_) { + save_ = font.color(); + font.setColor(lcolor.getFromLyXName(to_utf8(color))); + } } ColorChanger::~ColorChanger() { - orig_.setColor(lcolor.getFromLyXName(save_)); + if (change_) + orig_.setColor(save_); }