X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=2b954d3ed96d12926f78963c9f84cfb74587c6aa;hb=43dd383073fc61cfe5f24b87294c4e8698a1827a;hp=02a458dbeb04c1dc603176335780df1ada16893c;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 02a458dbeb..2b954d3ed9 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,21 +11,28 @@
 #include <config.h>
 
 #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 "support/docstring.h"
-
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 using namespace std;
 
+
 namespace lyx {
 
+/////////////////////////////////////////////////////////////////////////
+//
+// MetricsBase
+//
+/////////////////////////////////////////////////////////////////////////
 
 MetricsBase::MetricsBase()
 	: bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"),
@@ -39,15 +46,27 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w)
 {}
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// MetricsInfo
+//
+/////////////////////////////////////////////////////////////////////////
+
 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),
+	do_spellcheck(true), full_repaint(true), background_color(Color_background)
 {
 	base.bv = bv;
 }
@@ -65,6 +84,45 @@ 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;
+		}
+	}
+}
+
+
+Color PainterInfo::textColor(Color const & color) const
+{
+	if (change_.changed()) 
+		return change_.color();
+	if (selected)
+		return Color_selectiontext;
+	return color;
+}
+
+
+/////////////////////////////////////////////////////////////////////////
+//
+// ScriptChanger
+//
+/////////////////////////////////////////////////////////////////////////
+
 Styles smallerScriptStyle(Styles st)
 {
 	switch (st) {
@@ -78,11 +136,17 @@ Styles smallerScriptStyle(Styles st)
 	}
 }
 
+
 ScriptChanger::ScriptChanger(MetricsBase & mb)
 	: StyleChanger(mb, smallerScriptStyle(mb.style))
 {}
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// FracChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
 Styles smallerFracStyle(Styles st)
 {
@@ -104,16 +168,26 @@ FracChanger::FracChanger(MetricsBase & mb)
 {}
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// ArrayChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
 ArrayChanger::ArrayChanger(MetricsBase & mb)
 	: StyleChanger(mb, mb.style == LM_ST_DISPLAY ? LM_ST_TEXT : mb.style)
 {}
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// ShapeChanger
+//
+/////////////////////////////////////////////////////////////////////////
+
 ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape)
-	: Changer<FontInfo, FontShape>(font)
+	: Changer<FontInfo, FontShape>(font, font.shape())
 {
-	save_ = orig_.shape();
 	orig_.setShape(shape);
 }
 
@@ -124,16 +198,20 @@ ShapeChanger::~ShapeChanger()
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// StyleChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
 StyleChanger::StyleChanger(MetricsBase & mb, Styles style)
-	:	Changer<MetricsBase>(mb)
+	: Changer<MetricsBase>(mb)
 {
 	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--)
@@ -151,41 +229,68 @@ StyleChanger::~StyleChanger()
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// FontSetChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
-FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name)
-	:	Changer<MetricsBase>(mb)
+FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name,
+				bool really_change_font)
+	: Changer<MetricsBase>(mb), change_(really_change_font)
 {
-	save_ = mb;
-	FontSize oldsize = save_.font.size();
-	mb.fontname = name;
-	mb.font = sane_font;
-	augmentFont(mb.font, from_ascii(name));
-	mb.font.setSize(oldsize);
+	if (change_) {
+		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<MetricsBase>(mb)
+FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name,
+				bool really_change_font)
+	: Changer<MetricsBase>(mb), change_(really_change_font)
 {
-	save_ = mb;
-	FontSize oldsize = save_.font.size();
-	mb.fontname = to_utf8(name);
-	mb.font = sane_font;
-	augmentFont(mb.font, name);
-	mb.font.setSize(oldsize);
+	if (change_) {
+		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<MetricsBase>(mb)
+	: Changer<MetricsBase>(mb)
 {
-	save_ = mb;
 	mb.textwidth = w;
 }
 
@@ -196,19 +301,26 @@ WidthChanger::~WidthChanger()
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// ColorChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
-
-ColorChanger::ColorChanger(FontInfo & font, string const & color)
-	: Changer<FontInfo, string>(font)
+ColorChanger::ColorChanger(FontInfo & font, ColorCode color,
+			   bool really_change_color)
+	: Changer<FontInfo, ColorCode>(font, font.color()), change_(really_change_color)
 {
-	save_ = lcolor.getFromLyXName(color);
-	font.setColor(lcolor.getFromLyXName(color));
+	if (change_) {
+		font.setColor(color);
+	}
 }
 
 
 ColorChanger::~ColorChanger()
 {
-	orig_.setColor(lcolor.getFromLyXName(save_));
+	if (change_)
+		orig_.setColor(save_);
 }