X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderGraphic.cpp;h=a9342cce87565326f537bae97ee8789f4f607b45;hb=0a6ff99f28686066675848f3410f77c0947bc357;hp=3520290a973bff05ae6a1c44fa2e355fbd114187;hpb=06254d11dfdf670fab3548dc2a2674e7a261262c;p=lyx.git

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 3520290a97..a9342cce87 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,17 +36,14 @@ namespace lyx {
 
 RenderGraphic::RenderGraphic(Inset const * inset)
 {
-	loader_.connect(boost::bind(&Inset::updateFrontend, inset));
-	icon_.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_), icon_(other.icon_),
-		params_(other.params_)
+	: RenderBase(other), loader_(other.loader_), params_(other.params_)
 {
-	loader_.connect(boost::bind(&Inset::updateFrontend, inset));
-	icon_.connect(boost::bind(&Inset::updateFrontend, inset));
+	loader_.connect(bind(&Inset::updateFrontend, inset));
 }
 
 
@@ -56,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)
 {
@@ -63,15 +63,6 @@ void RenderGraphic::update(graphics::Params const & params)
 
 	if (!params_.filename.empty())
 		loader_.reset(params_.filename, params_);
-	// If icon is set to empty, icon_ will not be reset to empty
-	// but will not be displayed. This is to avoid repeated loading
-	// of the same icon when figure status changes.
-	if (!params_.icon.empty()) {
-		support::FileName const icon = support::libFileSearch("images/",
-			params_.icon, "png");
-		if (!icon.empty()) // using an empty bounding box
-			icon_.reset(icon, graphics::Params());
-	}
 }
 
 
@@ -79,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;
 }
 
 
@@ -145,53 +135,51 @@ bool readyToDisplay(graphics::Loader const & loader)
 
 void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	if (displayGraphic(params_)) {
+		if (loader_.status() == graphics::WaitingToLoad)
+			loader_.startLoading();
+		if (!loader_.monitoring())
+			loader_.startMonitoring();
+	}
+
 	bool 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();
+		dim_ = dim;
+		return;
+	}
 
 	dim.asc = image_ready ? loader_.image()->height() : 50;
 	dim.des = 0;
 
-	if (image_ready) {
-		dim.wid = loader_.image()->width() + 2 * Inset::TEXT_TO_INSET_OFFSET;
-	} else {
-		int font_width = 0;
-
-		FontInfo msgFont(mi.base.font);
-		msgFont.setFamily(SANS_FAMILY);
+	int font_width = 0;
 
-		// FIXME UNICODE
-		docstring const justname = from_utf8(params_.filename.onlyFileName());
-		if (!justname.empty()) {
-			msgFont.setSize(FONT_SIZE_FOOTNOTE);
-			font_width = theFontMetrics(msgFont).width(justname);
-		}
+	FontInfo msgFont(mi.base.font);
+	msgFont.setFamily(SANS_FAMILY);
 
-		docstring const msg = statusMessage(params_, loader_.status());
-		if (!msg.empty()) {
-			msgFont.setSize(FONT_SIZE_TINY);
-			font_width = max(font_width,
-				theFontMetrics(msgFont).width(msg));
-		}
+	// FIXME UNICODE
+	docstring const justname = from_utf8(params_.filename.onlyFileName());
+	if (!justname.empty()) {
+		msgFont.setSize(FONT_SIZE_FOOTNOTE);
+		font_width = theFontMetrics(msgFont).width(justname);
+	}
 
-		dim.wid = max(50, font_width + 15);
+	docstring const msg = statusMessage(params_, loader_.status());
+	if (!msg.empty()) {
+		msgFont.setSize(FONT_SIZE_TINY);
+		font_width = max(font_width,
+			theFontMetrics(msgFont).width(msg));
 	}
 
+	dim.wid = max(50, font_width + 15);
+
 	dim_ = dim;
 }
 
 
 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();
-		if (icon_.status() == graphics::WaitingToLoad)
-			icon_.startLoading();
-		if (!icon_.monitoring())
-			icon_.startMonitoring();
-	}
-
 	// This will draw the graphics. If the graphics has not been
 	// loaded yet, we draw just a rectangle.
 
@@ -229,9 +217,6 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
 				     y - 4, msg, msgFont);
 		}
 	}
-	if (!params_.icon.empty() && readyToDisplay(icon_))
-		pi.pain.image(x + Inset::TEXT_TO_INSET_OFFSET, y - dim_.asc, 
-			10, 10, *icon_.image());
 }