* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / render_preview.C

diff --git a/src/insets/render_preview.C b/src/insets/render_preview.C
index 21b4d43d8fed0457a67c23d2c118b3b52abcb75a..5badea260db3690bd1119f9f68fb81e19a8ced4d 100644 (file)
--- a/src/insets/render_preview.C
+++ b/src/insets/render_preview.C
@@ -21,25 +21,26 @@
 #include "lyxrc.h"
 #include "metricsinfo.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
 #include "graphics/Previews.h"
 
+#include "support/filename.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>
 
-using lyx::docstring;
+
+namespace lyx {
+
+using support::FileName;
 
 using std::string;
 using std::auto_ptr;
 
-namespace graphics = lyx::graphics;
-namespace support  = lyx::support;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
@@ -76,7 +77,7 @@ graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
 }
 
 
-string const statusMessage(BufferView const * bv, string const & snippet)
+docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
        BOOST_ASSERT(bv && bv->buffer());
 
@@ -84,7 +85,7 @@ string const statusMessage(BufferView const * bv, string const & snippet)
        graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
        graphics::PreviewLoader::Status const status = loader.status(snippet);
 
-       string message;
+       docstring message;
        switch (status) {
        case graphics::PreviewLoader::InQueue:
        case graphics::PreviewLoader::Processing:
@@ -112,7 +113,7 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 }
 
 
-void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
+bool RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
 
@@ -130,12 +131,13 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
                LyXFont font(mi.base.font);
                font.setFamily(LyXFont::SANS_FAMILY);
                font.setSize(LyXFont::SIZE_FOOTNOTE);
-                string stat = statusMessage(mi.base.bv, snippet_);
-                docstring dstat(stat.begin(), stat.end());
-               dim.wid = 15 + font_metrics::width(dstat, font);
+               docstring const stat = statusMessage(mi.base.bv, snippet_);
+               dim.wid = 15 + theFontMetrics(font).width(stat);
        }
 
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
@@ -164,11 +166,10 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                font.setFamily(LyXFont::SANS_FAMILY);
                font.setSize(LyXFont::SIZE_FOOTNOTE);
 
-                string stat = statusMessage(pi.base.bv, snippet_);
-                docstring dstat(stat.begin(), stat.end());
+               docstring const stat = statusMessage(pi.base.bv, snippet_);
                pi.pain.text(x + offset + 6,
-                            y - font_metrics::maxAscent(font) - 4,
-                            dstat, font);
+                            y - theFontMetrics(font).maxAscent() - 4,
+                            stat, font);
        }
 }
 
@@ -183,7 +184,7 @@ void RenderPreview::startLoading(Buffer const & buffer) const
 }
 
 
-void RenderPreview::addPreview(string const & latex_snippet,
+void RenderPreview::addPreview(docstring const & latex_snippet,
                               Buffer const & buffer)
 {
        if (status() == LyXRC::PREVIEW_OFF)
@@ -194,13 +195,15 @@ void RenderPreview::addPreview(string const & latex_snippet,
 }
 
 
-void RenderPreview::addPreview(string const & latex_snippet,
+void RenderPreview::addPreview(docstring const & latex_snippet,
                               graphics::PreviewLoader & ploader)
 {
        if (status() == LyXRC::PREVIEW_OFF)
                return;
 
-       snippet_ = support::trim(latex_snippet);
+       // FIXME UNICODE
+       // We have to make sure that we call latex with the right encoding
+       snippet_ = support::trim(to_utf8(latex_snippet));
        if (snippet_.empty())
                return;
 
@@ -240,11 +243,11 @@ void RenderPreview::imageReady(graphics::PreviewImage const & pimage)
 
 RenderMonitoredPreview::RenderMonitoredPreview(InsetBase const * inset)
        : RenderPreview(inset),
-         monitor_(std::string(), 2000)
+         monitor_(FileName(), 2000)
 {}
 
 
-void RenderMonitoredPreview::setAbsFile(string const & file)
+void RenderMonitoredPreview::setAbsFile(FileName const & file)
 {
        monitor_.reset(file);
 }
@@ -263,3 +266,5 @@ RenderMonitoredPreview::fileChanged(slot_type const & slot)
 {
        return monitor_.connect(slot);
 }
+
+} // namespace lyx