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

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 392ac1f122..48b41e2854 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -14,9 +14,6 @@
 
 #include "insets/Inset.h"
 
-#include "support/FileName.h"
-#include "support/filetools.h"
-#include "support/gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -26,9 +23,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;
 
@@ -37,14 +36,14 @@ namespace lyx {
 
 RenderGraphic::RenderGraphic(Inset const * inset)
 {
-	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));
 }
 
 
@@ -53,6 +52,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 +70,7 @@ namespace {
 
 bool displayGraphic(graphics::Params const & params)
 {
-	return params.display != graphics::NoDisplay &&
-		lyxrc.display_graphics != graphics::NoDisplay;
+	return params.display && lyxrc.display_graphics;
 }
 
 
@@ -133,8 +135,14 @@ bool readyToDisplay(graphics::Loader const & loader)
 
 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();
+	}
 
+	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();
@@ -142,7 +150,7 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 		return;
 	}
 
-	dim.asc = image_ready ? loader_.image()->height() : 50;
+	dim.asc = 50;
 	dim.des = 0;
 
 	int font_width = 0;
@@ -172,13 +180,6 @@ 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.