X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderGraphic.cpp;h=df1a93a1804f565301945bf8b5c60a94ef899a74;hb=483e1fcd196ed61be3928e6f59f69dadbc2aaea4;hp=b5c44ff265013fb4865102b91be1d394b0d4cb13;hpb=eea79637c78bb9916031924eca7b305cfb8e83df;p=lyx.git

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index b5c44ff265..df1a93a180 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -14,7 +14,9 @@
 
 #include "insets/Inset.h"
 
-#include "gettext.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -28,29 +30,21 @@
 
 #include <boost/bind.hpp>
 
+using namespace std;
 
 namespace lyx {
 
-using support::onlyFilename;
-
-using std::string;
-
 
 RenderGraphic::RenderGraphic(Inset const * inset)
 {
-	loader_.connect(boost::bind(&LyX::updateInset,
-				    boost::cref(LyX::cref()), inset));
+	loader_.connect(boost::bind(&Inset::updateFrontend, inset));
 }
 
 
-RenderGraphic::RenderGraphic(RenderGraphic const & other,
-			     Inset const * inset)
-	: RenderBase(other),
-	  loader_(other.loader_),
-	  params_(other.params_)
+RenderGraphic::RenderGraphic(RenderGraphic const & other, Inset const * inset)
+	: RenderBase(other), loader_(other.loader_), params_(other.params_)
 {
-	loader_.connect(boost::bind(&LyX::updateInset,
-				    boost::cref(LyX::cref()), inset));
+	loader_.connect(boost::bind(&Inset::updateFrontend, inset));
 }
 
 
@@ -64,9 +58,8 @@ void RenderGraphic::update(graphics::Params const & params)
 {
 	params_ = params;
 
-	if (!params_.filename.empty()) {
+	if (!params_.filename.empty())
 		loader_.reset(params_.filename, params_);
-	}
 }
 
 
@@ -74,8 +67,7 @@ namespace {
 
 bool displayGraphic(graphics::Params const & params)
 {
-	return params.display != graphics::NoDisplay &&
-		lyxrc.display_graphics != graphics::NoDisplay;
+	return params.display && lyxrc.display_graphics;
 }
 
 
@@ -140,52 +132,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()->getHeight() : 50;
+	dim.asc = image_ready ? loader_.image()->height() : 50;
 	dim.des = 0;
 
-	if (image_ready) {
-		dim.wid = loader_.image()->getWidth() +
-			2 * Inset::TEXT_TO_INSET_OFFSET;
-	} else {
-		int font_width = 0;
-
-		Font msgFont(mi.base.font);
-		msgFont.setFamily(Font::SANS_FAMILY);
+	int font_width = 0;
 
-		// FIXME UNICODE
-		docstring const justname =
-			from_utf8(onlyFilename(params_.filename.absFilename()));
-		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 = std::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 = std::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();
-	}
-
 	// This will draw the graphics. If the graphics has not been
 	// loaded yet, we draw just a rectangle.
 
@@ -204,12 +195,12 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
 				  Color_foreground);
 
 		// Print the file name.
-		Font msgFont = pi.base.font;
-		msgFont.setFamily(Font::SANS_FAMILY);
-		string const justname = onlyFilename(params_.filename.absFilename());
+		FontInfo msgFont = pi.base.font;
+		msgFont.setFamily(SANS_FAMILY);
+		string const justname = params_.filename.onlyFileName();
 
 		if (!justname.empty()) {
-			msgFont.setSize(Font::SIZE_FOOTNOTE);
+			msgFont.setSize(FONT_SIZE_FOOTNOTE);
 			pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
 				   y - theFontMetrics(msgFont).maxAscent() - 4,
 				   from_utf8(justname), msgFont);
@@ -218,7 +209,7 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
 		// Print the message.
 		docstring const msg = statusMessage(params_, loader_.status());
 		if (!msg.empty()) {
-			msgFont.setSize(Font::SIZE_TINY);
+			msgFont.setSize(FONT_SIZE_TINY);
 			pi.pain.text(x + Inset::TEXT_TO_INSET_OFFSET + 6,
 				     y - 4, msg, msgFont);
 		}