r20580 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Nov 25 21:40:18 2015
New Revision: 20580

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20580
Log:
#13561: Scale image always to higher scaling value when chain is joined <ale>

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20580&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp	Wed Nov 25 21:40:18 2015
@@ -684,7 +684,9 @@
 	imgDpiY->blockSignals(true);
 	if (keepImageDPIRatioButton->isChecked())
 	{
-		imgDpiY->setValue(imgDpiX->value());
+		double minXY = qMin(imgDpiX->value(), imgDpiY->value());
+		imgDpiX->setValue(minXY);
+		imgDpiY->setValue(minXY);
 		handleLocalDpi();
 		keepImageWHRatioButton->setChecked(true);
 		cbProportional->setChecked(true);
@@ -706,7 +708,9 @@
 	imageYScaleSpinBox->blockSignals(true);
 	if (keepImageWHRatioButton->isChecked())
 	{
-		imageYScaleSpinBox->setValue(imageXScaleSpinBox->value());
+		double maxXY = qMax(imageXScaleSpinBox->value(), imageYScaleSpinBox->value());
+		imageXScaleSpinBox->setValue(maxXY);
+		imageYScaleSpinBox->setValue(maxXY);
 		handleLocalScale();
 		keepImageDPIRatioButton->setChecked(true);
 		cbProportional->setChecked(true);