X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=788709cd49cccc413d88582dc21c44256dbc63dd;hb=4594b1425b484138fcae28996f460312d810b8d5;hp=679dd91904dc209bdc9d5638e931173e39edf729;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 679dd91904..788709cd49 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 <config.h>
 
 #include "BufferView.h"
-#include "LColor.h"
+#include "ColorSet.h"
 #include "MetricsInfo.h"
 
+#include "insets/Inset.h"
+
 #include "mathed/MathSupport.h"
 
 #include "frontends/Painter.h"
 
-#include <boost/assert.hpp>
+#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,25 +40,33 @@ MetricsBase::MetricsBase()
 {}
 
 
-MetricsBase::MetricsBase(BufferView * b, LyXFont 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, LyXFont 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)
+	: pain(painter), ltr_pos(false), change_(), selected(false),
+	full_repaint(true), background_color(Color_background)
 {
 	base.bv = bv;
 }
@@ -68,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();
+
+	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) {
@@ -81,11 +126,17 @@ Styles smallerScriptStyle(Styles st)
 	}
 }
 
+
 ScriptChanger::ScriptChanger(MetricsBase & mb)
 	: StyleChanger(mb, smallerScriptStyle(mb.style))
 {}
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// FracChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
 Styles smallerFracStyle(Styles st)
 {
@@ -107,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(LyXFont & font, LyXFont::FONT_SHAPE shape)
-	: Changer<LyXFont, LyXFont::FONT_SHAPE>(font)
+ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape)
+	: Changer<FontInfo, FontShape>(font)
 {
 	save_ = orig_.shape();
 	orig_.setShape(shape);
@@ -128,9 +189,14 @@ 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 },
@@ -155,26 +221,31 @@ StyleChanger::~StyleChanger()
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// FontSetChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
 FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name)
-	:	Changer<MetricsBase>(mb)
+	: Changer<MetricsBase>(mb)
 {
 	save_ = mb;
-	LyXFont::FONT_SIZE oldsize = save_.font.size();
+	FontSize oldsize = save_.font.size();
 	mb.fontname = name;
-	mb.font = LyXFont();
+	mb.font = sane_font;
 	augmentFont(mb.font, from_ascii(name));
 	mb.font.setSize(oldsize);
 }
 
 
 FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name)
-	:	Changer<MetricsBase>(mb)
+	: Changer<MetricsBase>(mb)
 {
 	save_ = mb;
-	LyXFont::FONT_SIZE oldsize = save_.font.size();
+	FontSize oldsize = save_.font.size();
 	mb.fontname = to_utf8(name);
-	mb.font = LyXFont();
+	mb.font = sane_font;
 	augmentFont(mb.font, name);
 	mb.font.setSize(oldsize);
 }
@@ -186,8 +257,14 @@ FontSetChanger::~FontSetChanger()
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// WidthChanger
+//
+/////////////////////////////////////////////////////////////////////////
+
 WidthChanger::WidthChanger(MetricsBase & mb, int w)
-	:	Changer<MetricsBase>(mb)
+	: Changer<MetricsBase>(mb)
 {
 	save_ = mb;
 	mb.textwidth = w;
@@ -200,10 +277,14 @@ WidthChanger::~WidthChanger()
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// ColorChanger
+//
+/////////////////////////////////////////////////////////////////////////
 
-
-ColorChanger::ColorChanger(LyXFont & font, string const & color)
-	: Changer<LyXFont, string>(font)
+ColorChanger::ColorChanger(FontInfo & font, string const & color)
+	: Changer<FontInfo, string>(font)
 {
 	save_ = lcolor.getFromLyXName(color);
 	font.setColor(lcolor.getFromLyXName(color));