X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Frender_preview.C;h=5badea260db3690bd1119f9f68fb81e19a8ced4d;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=3e4c643f567407fd6d29ce80c2baaf49276047e4;hpb=f16199abd2f6ea5925838084b716a84097f1fb09;p=lyx.git diff --git a/src/insets/render_preview.C b/src/insets/render_preview.C index 3e4c643f56..5badea260d 100644 --- a/src/insets/render_preview.C +++ b/src/insets/render_preview.C @@ -14,7 +14,6 @@ #include "insets/inset.h" #include "BufferView.h" -#include "debug.h" #include "dimension.h" #include "gettext.h" #include "LColor.h" @@ -22,23 +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 + +namespace lyx { + +using support::FileName; + using std::string; using std::auto_ptr; -namespace graphics = lyx::graphics; -namespace support = lyx::support; - LyXRC_PreviewStatus RenderPreview::status() { @@ -68,16 +70,22 @@ auto_ptr RenderPreview::clone(InsetBase const * inset) const namespace { -string const statusMessage(BufferView const * bv, string const & snippet) +graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer) +{ + graphics::Previews const & previews = graphics::Previews::get(); + return previews.loader(buffer); +} + + +docstring const statusMessage(BufferView const * bv, string const & snippet) { BOOST_ASSERT(bv && bv->buffer()); Buffer const & buffer = *bv->buffer(); - graphics::Previews const & previews = graphics::Previews::get(); - graphics::PreviewLoader const & loader = previews.loader(buffer); + 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: @@ -100,15 +108,14 @@ string const statusMessage(BufferView const * bv, string const & snippet) graphics::PreviewImage const * RenderPreview::getPreviewImage(Buffer const & buffer) const { - graphics::Previews & previews = graphics::Previews::get(); - graphics::PreviewLoader & loader = previews.loader(buffer); + graphics::PreviewLoader const & loader = getPreviewLoader(buffer); return loader.preview(snippet_); } - -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()); + BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer()); graphics::PreviewImage const * const pimage = getPreviewImage(*mi.base.bv->buffer()); @@ -124,40 +131,46 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const LyXFont font(mi.base.font); font.setFamily(LyXFont::SANS_FAMILY); font.setSize(LyXFont::SIZE_FOOTNOTE); - dim.wid = 15 + - font_metrics::width(statusMessage(mi.base.bv, snippet_), - 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; } void RenderPreview::draw(PainterInfo & pi, int x, int y) const { - BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer()); + BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer()); graphics::PreviewImage const * const pimage = getPreviewImage(*pi.base.bv->buffer()); + graphics::Image const * const image = pimage ? pimage->image() : 0; - if (pimage && pimage->image()) { + if (image) { pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(), - *(pimage->image())); - return; - } + *image); + + } else { + int const offset = InsetOld::TEXT_TO_INSET_OFFSET; + + pi.pain.rectangle(x + offset, + y - dim_.asc, + dim_.wid - 2 * offset, + dim_.asc + dim_.des, + LColor::foreground); - pi.pain.rectangle(x + InsetOld::TEXT_TO_INSET_OFFSET, - y - dim_.asc, - dim_.wid - 2 * InsetOld::TEXT_TO_INSET_OFFSET, - dim_.asc + dim_.des, - LColor::foreground); - - LyXFont font(pi.base.font); - font.setFamily(LyXFont::SANS_FAMILY); - font.setSize(LyXFont::SIZE_FOOTNOTE); - pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6, - y - font_metrics::maxAscent(font) - 4, - statusMessage(pi.base.bv, snippet_), font); + LyXFont font(pi.base.font); + font.setFamily(LyXFont::SANS_FAMILY); + font.setSize(LyXFont::SIZE_FOOTNOTE); + + docstring const stat = statusMessage(pi.base.bv, snippet_); + pi.pain.text(x + offset + 6, + y - theFontMetrics(font).maxAscent() - 4, + stat, font); + } } @@ -166,32 +179,31 @@ void RenderPreview::startLoading(Buffer const & buffer) const if (status() == LyXRC::PREVIEW_OFF || snippet_.empty()) return; - graphics::Previews & previews = graphics::Previews::get(); - graphics::PreviewLoader & loader = previews.loader(buffer); + graphics::PreviewLoader const & loader = getPreviewLoader(buffer); loader.startLoading(); - lyxerr << "RenderPreview::startLoading: " << snippet_ << std::endl; } -void RenderPreview::addPreview(string const & latex_snippet, +void RenderPreview::addPreview(docstring const & latex_snippet, Buffer const & buffer) { if (status() == LyXRC::PREVIEW_OFF) return; - graphics::Previews & previews = graphics::Previews::get(); - graphics::PreviewLoader & loader = previews.loader(buffer); + graphics::PreviewLoader & loader = getPreviewLoader(buffer); addPreview(latex_snippet, loader); } -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; @@ -215,8 +227,7 @@ void RenderPreview::removePreview(Buffer const & buffer) if (snippet_.empty()) return; - graphics::Previews & previews = graphics::Previews::get(); - graphics::PreviewLoader & loader = previews.loader(buffer); + graphics::PreviewLoader & loader = getPreviewLoader(buffer); loader.remove(snippet_); snippet_.erase(); } @@ -232,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); } @@ -255,3 +266,5 @@ RenderMonitoredPreview::fileChanged(slot_type const & slot) { return monitor_.connect(slot); } + +} // namespace lyx