#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>
+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) {
- dim.asc = pimage->ascent();
- dim.des = pimage->descent();
- dim.wid = pimage->width();
+ // If prepared, load the picture before dim calculation. See bug #5627.
+ pimage->image();
+ 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);
}
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());
dim_.asc + dim_.des,
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,
{
// 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)
{}