X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=1d4fb9d6a5f521c8a73b4d9cb3e19beff22bc64d;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=763ab7c972d517d6f56d0d14337747fc1c66497c;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 763ab7c972..1d4fb9d6a5 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -14,9 +14,8 @@
 #include "insets/Inset.h"
 
 #include "BufferView.h"
-#include "Color.h"
 #include "Dimension.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -33,13 +32,11 @@
 
 #include <boost/bind.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
-using std::string;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
@@ -127,16 +124,14 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 		getPreviewImage(mi.base.bv->buffer());
 
 	if (pimage) {
-		dim.asc = pimage->ascent();
-		dim.des = pimage->descent();
-		dim.wid = pimage->width();
+		dim = pimage->dim();
 	} else {
 		dim.asc = 50;
 		dim.des = 0;
 
-		Font font(mi.base.font);
-		font.setFamily(Font::SANS_FAMILY);
-		font.setSize(Font::SIZE_FOOTNOTE);
+		FontInfo font(mi.base.font);
+		font.setFamily(SANS_FAMILY);
+		font.setSize(FONT_SIZE_FOOTNOTE);
 		docstring const stat = statusMessage(mi.base.bv, snippet_);
 		dim.wid = 15 + theFontMetrics(font).width(stat);
 	}
@@ -164,11 +159,11 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 				  y - dim_.asc,
 				  dim_.wid - 2 * offset,
 				  dim_.asc + dim_.des,
-				  Color::foreground);
+				  Color_foreground);
 
-		Font font(pi.base.font);
-		font.setFamily(Font::SANS_FAMILY);
-		font.setSize(Font::SIZE_FOOTNOTE);
+		FontInfo font(pi.base.font);
+		font.setFamily(SANS_FAMILY);
+		font.setSize(FONT_SIZE_FOOTNOTE);
 
 		docstring const stat = statusMessage(pi.base.bv, snippet_);
 		pi.pain.text(x + offset + 6,
@@ -241,13 +236,12 @@ void RenderPreview::imageReady(graphics::PreviewImage const & pimage)
 {
 	// Check the current snippet is the same as that previewed.
 	if (snippet_ == pimage.snippet())
-		LyX::cref().updateInset(parent_);
+		parent_->updateFrontend();
 }
 
 
 RenderMonitoredPreview::RenderMonitoredPreview(Inset const * inset)
-	: RenderPreview(inset),
-	  monitor_(FileName(), 2000)
+	: RenderPreview(inset), monitor_(FileName(), 2000)
 {}