* 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 e0745fc8cd9518b8f1f37d073117f396786bbf0e..5badea260db3690bd1119f9f68fb81e19a8ced4d 100644 (file)
--- a/src/insets/render_preview.C
+++ b/src/insets/render_preview.C
@@ -28,6 +28,7 @@
 #include "graphics/PreviewLoader.h"
 #include "graphics/Previews.h"
 
+#include "support/filename.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>
@@ -35,6 +36,8 @@
 
 namespace lyx {
 
+using support::FileName;
+
 using std::string;
 using std::auto_ptr;
 
@@ -74,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());
 
@@ -96,8 +99,7 @@ string const statusMessage(BufferView const * bv, string const & snippet)
                break;
        }
 
-       // FIXME UNICODE
-       return to_utf8(message);
+       return message;
 }
 
 } // namespace anon
@@ -111,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());
 
@@ -129,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);
-               // FIXME UNICODE
-               docstring const stat = from_utf8(statusMessage(mi.base.bv, snippet_));
+               docstring const stat = statusMessage(mi.base.bv, snippet_);
                dim.wid = 15 + theFontMetrics(font).width(stat);
        }
 
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
@@ -163,8 +166,7 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                font.setFamily(LyXFont::SANS_FAMILY);
                font.setSize(LyXFont::SIZE_FOOTNOTE);
 
-               // FIXME UNICODE
-               docstring const stat = from_utf8(statusMessage(pi.base.bv, snippet_));
+               docstring const stat = statusMessage(pi.base.bv, snippet_);
                pi.pain.text(x + offset + 6,
                             y - theFontMetrics(font).maxAscent() - 4,
                             stat, font);
@@ -241,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);
 }