#include "graphics/PreviewLoader.h"
#include "graphics/Previews.h"
+#include "support/filename.h"
#include "support/lstrings.h"
#include <boost/bind.hpp>
namespace lyx {
+using support::FileName;
+
using std::string;
using std::auto_ptr;
}
-string const statusMessage(BufferView const * bv, string const & snippet)
+docstring const statusMessage(BufferView const * bv, string const & snippet)
{
BOOST_ASSERT(bv && bv->buffer());
break;
}
- // FIXME UNICODE
- return to_utf8(message);
+ return message;
}
} // namespace anon
}
-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());
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;
}
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);
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);
}