From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 6 Jun 2008 12:39:43 +0000 (+0000)
Subject: start image loading at metrics time.
X-Git-Tag: 1.6.10~4475
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e4a5278060ea2571df0ae18c649c02f5ed8431b7;p=features.git

start image loading at metrics time.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25165 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 392ac1f122..ca8008c65e 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -133,8 +133,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 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();
@@ -172,13 +178,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.