#include "insets/Inset.h"
-#include "support/FileName.h"
-#include "support/filetools.h"
-#include "support/gettext.h"
+#include "Buffer.h"
#include "LyX.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "graphics/GraphicsImage.h"
+#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
using namespace std;
RenderGraphic::RenderGraphic(Inset const * inset)
+ : loader_(inset->buffer().fileName())
{
- loader_.connect(boost::bind(&Inset::updateFrontend, inset));
+ loader_.connect(bind(&Inset::updateFrontend, inset));
}
RenderGraphic::RenderGraphic(RenderGraphic const & other, Inset const * inset)
: RenderBase(other), loader_(other.loader_), params_(other.params_)
{
- loader_.connect(boost::bind(&Inset::updateFrontend, inset));
+ loader_.connect(bind(&Inset::updateFrontend, inset));
}
return new RenderGraphic(*this, inset);
}
+void RenderGraphic::reload() const
+{
+ loader_.reload();
+}
void RenderGraphic::update(graphics::Params const & params)
{
bool displayGraphic(graphics::Params const & params)
{
- return params.display != graphics::NoDisplay &&
- lyxrc.display_graphics != graphics::NoDisplay;
+ return params.display && lyxrc.display_graphics;
}
return loader.image()->isDrawable();
}
-} // namespace anon
+} // namespace
void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
loader_.startLoading();
if (!loader_.monitoring())
loader_.startMonitoring();
+ loader_.checkModifiedAsync();
}
- bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
+ bool const image_ready = displayGraphic(params_) && readyToDisplay(loader_);
if (image_ready) {
dim.wid = loader_.image()->width() + 2 * Inset::TEXT_TO_INSET_OFFSET;
dim.asc = loader_.image()->height();
return;
}
- dim.asc = image_ready ? loader_.image()->height() : 50;
+ dim.asc = 50;
dim.des = 0;
int font_width = 0;
+ int font_height = 0;
FontInfo msgFont(mi.base.font);
msgFont.setFamily(SANS_FAMILY);
if (!justname.empty()) {
msgFont.setSize(FONT_SIZE_FOOTNOTE);
font_width = theFontMetrics(msgFont).width(justname);
+ font_height = theFontMetrics(msgFont).maxHeight();
}
docstring const msg = statusMessage(params_, loader_.status());
msgFont.setSize(FONT_SIZE_TINY);
font_width = max(font_width,
theFontMetrics(msgFont).width(msg));
+ font_height += theFontMetrics(msgFont).maxAscent();
+ dim.des = theFontMetrics(msgFont).maxDescent();
}
dim.wid = max(50, font_width + 15);
+ dim.asc = max(50, font_height + 15);
dim_ = dim;
}
{
// This will draw the graphics. If the graphics has not been
// loaded yet, we draw just a rectangle.
+ int const x1 = x + Inset::TEXT_TO_INSET_OFFSET;
+ int const y1 = y - dim_.asc;
+ int const w = dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET;
+ int const h = dim_.height();
- if (displayGraphic(params_) && readyToDisplay(loader_)) {
- pi.pain.image(x + Inset::TEXT_TO_INSET_OFFSET,
- y - dim_.asc,
- dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET,
- dim_.asc + dim_.des,
- *loader_.image());
+ if (displayGraphic(params_) && readyToDisplay(loader_))
+ pi.pain.image(x1, y1, w, h, *loader_.image());
- } else {
- pi.pain.rectangle(x + Inset::TEXT_TO_INSET_OFFSET,
- y - dim_.asc,
- dim_.wid - 2 * Inset::TEXT_TO_INSET_OFFSET,
- dim_.asc + dim_.des,
- Color_foreground);
+ else {
+ Color c = pi.change_.changed() ? pi.change_.color() : Color_foreground;
+ pi.pain.rectangle(x1, y1, w, h, c);
// Print the file name.
FontInfo msgFont = pi.base.font;
+ msgFont.setPaintColor(c);
msgFont.setFamily(SANS_FAMILY);
string const justname = params_.filename.onlyFileName();
if (!justname.empty()) {
msgFont.setSize(FONT_SIZE_FOOTNOTE);
- pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
- y - theFontMetrics(msgFont).maxAscent() - 4,
- from_utf8(justname), msgFont);
+ pi.pain.text(x1 + 6, y - theFontMetrics(msgFont).maxAscent() - 4,
+ from_utf8(justname), msgFont);
}
// Print the message.
docstring const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
msgFont.setSize(FONT_SIZE_TINY);
- pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
- y - 4, msg, msgFont);
+ pi.pain.text(x1 + 6, y - 4, msg, msgFont);
}
}
+ pi.change_.paintCue(pi, x1, y1, x1 + w, y1 + h);
}