X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderGraphic.cpp;h=280a657ceb61ac0490c48230bddaec5046518937;hb=2d48072e664099385b2442f7166b3c57129799bb;hp=392ac1f1220fb715bc922561a1c92ad2f1c73520;hpb=21f59b816bfb72f1d524f41fce662982b45e8f1b;p=lyx.git

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 392ac1f122..280a657ceb 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -14,9 +14,7 @@
 
 #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"
@@ -26,9 +24,11 @@
 
 #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;
 
@@ -36,15 +36,16 @@ namespace lyx {
 
 
 RenderGraphic::RenderGraphic(Inset const * inset)
+	: inset_(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_)
+	: RenderBase(other), inset_(inset), loader_(other.loader_), params_(other.params_)
 {
-	loader_.connect(boost::bind(&Inset::updateFrontend, inset));
+	loader_.connect(bind(&Inset::updateFrontend, inset));
 }
 
 
@@ -53,6 +54,10 @@ RenderBase * RenderGraphic::clone(Inset const * inset) const
 	return new RenderGraphic(*this, inset);
 }
 
+void RenderGraphic::reload() const
+{
+	loader_.reload();
+}
 
 void RenderGraphic::update(graphics::Params const & params)
 {
@@ -67,8 +72,7 @@ namespace {
 
 bool displayGraphic(graphics::Params const & params)
 {
-	return params.display != graphics::NoDisplay &&
-		lyxrc.display_graphics != graphics::NoDisplay;
+	return params.display && lyxrc.display_graphics;
 }
 
 
@@ -128,24 +132,33 @@ bool readyToDisplay(graphics::Loader const & loader)
 	return loader.image()->isDrawable();
 }
 
-} // namespace anon
+} // namespace
 
 
 void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
+	if (displayGraphic(params_)) {
+		if (loader_.status() == graphics::WaitingToLoad)
+			loader_.startLoading();
+		if (!loader_.monitoring())
+			loader_.startMonitoring();
+		loader_.checkModifiedAsync();
+	}
 
+	bool const image_ready = displayGraphic(params_) && readyToDisplay(loader_);
 	if (image_ready) {
-		dim.wid = loader_.image()->width() + 2 * Inset::TEXT_TO_INSET_OFFSET;
+		dim.wid = loader_.image()->width() + inset_->leftOffset(mi.base.bv)
+			+ inset_->rightOffset(mi.base.bv);
 		dim.asc = loader_.image()->height();
 		dim_ = dim;
 		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);
@@ -153,18 +166,22 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 	// FIXME UNICODE
 	docstring const justname = from_utf8(params_.filename.onlyFileName());
 	if (!justname.empty()) {
-		msgFont.setSize(FONT_SIZE_FOOTNOTE);
+		msgFont.setSize(FOOTNOTE_SIZE);
 		font_width = theFontMetrics(msgFont).width(justname);
+		font_height = theFontMetrics(msgFont).maxHeight();
 	}
 
 	docstring const msg = statusMessage(params_, loader_.status());
 	if (!msg.empty()) {
-		msgFont.setSize(FONT_SIZE_TINY);
+		msgFont.setSize(TINY_SIZE);
 		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;
 }
@@ -172,50 +189,40 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
 {
-	if (displayGraphic(params_)) {
-		if (loader_.status() == graphics::WaitingToLoad)
-			loader_.startLoading();
-		if (!loader_.monitoring())
-			loader_.startMonitoring();
-	}
-
 	// This will draw the graphics. If the graphics has not been
 	// loaded yet, we draw just a rectangle.
+	int const x1 = x + inset_->leftOffset(pi.base.bv);
+	int const y1 = y - dim_.asc;
+	int const w = dim_.wid - inset_->leftOffset(pi.base.bv) - inset_->rightOffset(pi.base.bv);
+	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);
+			msgFont.setSize(FOOTNOTE_SIZE);
+			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);
+			msgFont.setSize(TINY_SIZE);
+			pi.pain.text(x1 + 6, y - 4, msg, msgFont);
 		}
 	}
+	pi.change.paintCue(pi, x1, y1, x1 + w, y1 + h);
 }