This should be the last of the commits refactoring the InsetLayout code.

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index cba453df10b22872421260e7a02878bc58a68262..1d4fb9d6a5f521c8a73b4d9cb3e19beff22bc64d 100644 (file)
--- 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()
 {
@@ -119,7 +116,7 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 }
 
 
-bool RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
+void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        BOOST_ASSERT(mi.base.bv);
 
@@ -127,23 +124,19 @@ bool 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);
        }
 
-       bool const changed = dim_ != dim;
        dim_ = dim;
-       return changed;
 }
 
 
@@ -166,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,
@@ -243,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)
 {}