#include "BufferView.h"
#include "Dimension.h"
-#include "gettext.h"
#include "LyX.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "graphics/Previews.h"
#include "support/FileName.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::FileName;
-
-using std::string;
-
LyXRC_PreviewStatus RenderPreview::status()
{
RenderPreview::~RenderPreview()
{
- if (ploader_connection_.connected())
- ploader_connection_.disconnect();
+ if (ploader_connection_.connected())
+ ploader_connection_.disconnect();
}
graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
{
- graphics::Previews const & previews = graphics::Previews::get();
- return previews.loader(buffer);
+ return thePreviews().loader(buffer);
}
docstring const statusMessage(BufferView const * bv, string const & snippet)
{
- BOOST_ASSERT(bv);
+ LASSERT(bv, /**/);
Buffer const & buffer = bv->buffer();
graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
{
- BOOST_ASSERT(mi.base.bv);
+ LASSERT(mi.base.bv, /**/);
graphics::PreviewImage const * const pimage =
getPreviewImage(mi.base.bv->buffer());
if (pimage) {
+ // If prepared, load the picture before dim calculation. See bug #5627.
+ pimage->image();
dim = pimage->dim();
} else {
dim.asc = 50;
void RenderPreview::draw(PainterInfo & pi, int x, int y) const
{
- BOOST_ASSERT(pi.base.bv);
+ LASSERT(pi.base.bv, /**/);
graphics::PreviewImage const * const pimage =
getPreviewImage(pi.base.bv->buffer());
}
-void RenderPreview::startLoading(Buffer const & buffer) const
+void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
{
- if (status() == LyXRC::PREVIEW_OFF || snippet_.empty())
+ if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
return;
graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
- loader.startLoading();
+ loader.startLoading(forexport);
}
void RenderPreview::addPreview(docstring const & latex_snippet,
- Buffer const & buffer)
+ Buffer const & buffer,
+ bool ignore_lyxrc)
{
- if (status() == LyXRC::PREVIEW_OFF)
+ if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
return;
graphics::PreviewLoader & loader = getPreviewLoader(buffer);
- addPreview(latex_snippet, loader);
+ addPreview(latex_snippet, loader, ignore_lyxrc);
}
void RenderPreview::addPreview(docstring const & latex_snippet,
- graphics::PreviewLoader & ploader)
+ graphics::PreviewLoader & ploader,
+ bool ignore_lyxrc)
{
- if (status() == LyXRC::PREVIEW_OFF)
+ if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
return;
// FIXME UNICODE
// is ready for loading.
if (!ploader_connection_.connected()) {
ploader_connection_ = ploader.connect(
- boost::bind(&RenderPreview::imageReady, this, _1));
+ bind(&RenderPreview::imageReady, this, _1));
}
ploader.add(snippet_);