r22818 by jghali - Comment out now unnecessary call to image palette's showScaleAndOffset() in CanvasMode_ImageImport::setImage()

scribus-commit scribus-commit at lists.scribus.net
Wed Jan 23 21:06:58 UTC 2019


Author: jghali
Date: Wed Jan 23 21:06:58 2019
New Revision: 22818

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22818
Log:
Comment out now unnecessary call to image palette's showScaleAndOffset() in CanvasMode_ImageImport::setImage()

Modified:
    trunk/Scribus/scribus/canvasmode_imageimport.cpp

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22818&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp	Wed Jan 23 21:06:58 2019
@@ -236,7 +236,9 @@
 	currItem->IRender = m_doc->cmsSettings().DefaultIntentImages;
 	qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	m_doc->loadPict(fileName, currItem, false, true);
-	m_ScMW->propertiesPalette->imagePal->showScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
+	// Call to showScaleAndOffset() is now very likely unnecessary
+	// due to mecanisms used to update properties in PP in 1.5.x+
+	//m_ScMW->propertiesPalette->imagePal->showScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
 	m_ScMW->repaint();
 	qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	m_view->DrawNew();




More information about the scribus-commit mailing list