X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmetricsinfo.C;h=60ba208a4faec2581d6abac2e82207c4163fe9e8;hb=5c00d0f48978964a576070d5950556787aa365bb;hp=e00e59f853aeb442cd845904aef2eb66971e4f2e;hpb=3bb63924d502ec9d7cec06e8ff434e3e209fecb9;p=lyx.git

diff --git a/src/metricsinfo.C b/src/metricsinfo.C
index e00e59f853..60ba208a4f 100644
--- a/src/metricsinfo.C
+++ b/src/metricsinfo.C
@@ -10,12 +10,17 @@
 
 #include <config.h>
 
+#include "BufferView.h"
+#include "LColor.h"
 #include "metricsinfo.h"
+
 #include "mathed/math_support.h"
+
 #include "frontends/Painter.h"
-#include "BufferView.h"
-#include "LColor.h"
 
+#include <boost/assert.hpp>
+
+using std::string;
 
 
 MetricsBase::MetricsBase()
@@ -24,7 +29,6 @@ MetricsBase::MetricsBase()
 {}
 
 
-
 MetricsBase::MetricsBase(BufferView * b, LyXFont const & f, int w)
 	: bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"),
 	  textwidth(w)
@@ -42,8 +46,8 @@ MetricsInfo::MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth)
 
 
 
-PainterInfo::PainterInfo(BufferView * bv)
-	: pain(bv->painter())
+PainterInfo::PainterInfo(BufferView * bv, Painter & painter)
+	: pain(painter)
 {
 	base.bv = bv;
 }
@@ -144,9 +148,11 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name)
 	:	Changer<MetricsBase>(mb)
 {
 	save_ = mb;
+	LyXFont::FONT_SIZE oldsize = save_.font.size();
 	mb.fontname = name;
 	mb.font = LyXFont();
 	augmentFont(mb.font, name);
+	mb.font.setSize(oldsize);
 }
 
 
@@ -160,7 +166,7 @@ WidthChanger::WidthChanger(MetricsBase & mb, int w)
 	:	Changer<MetricsBase>(mb)
 {
 	save_ = mb;
-	mb.textwidth     = w;
+	mb.textwidth = w;
 }
 
 
@@ -175,14 +181,12 @@ WidthChanger::~WidthChanger()
 ColorChanger::ColorChanger(LyXFont & font, string const & color)
 	: Changer<LyXFont, string>(font)
 {
-	save_ = lcolor.getFromGUIName(color);
-	font.setColor(lcolor.getFromGUIName(color));
+	save_ = lcolor.getFromLyXName(color);
+	font.setColor(lcolor.getFromLyXName(color));
 }
 
 
 ColorChanger::~ColorChanger()
 {
-	orig_.setColor(lcolor.getFromGUIName(save_));
+	orig_.setColor(lcolor.getFromLyXName(save_));
 }
-
-