Improved approach to honor aspect ratio during size changes.

2015-09-07 16:19:35 -04:00
parent 360d85bbbc
commit 409abe4428
3 changed files with 34 additions and 7 deletions
@@ -278,9 +278,19 @@ namespace glabels

 			if ( sizeAspectCheck->isChecked() )
 			{
-				mObject->setSizeHonorAspect( sizeWSpin->value(), sizeHSpin->value() );
-				sizeWSpin->setValue( mObject->w() );
-				sizeHSpin->setValue( mObject->h() );
+				double spinW = sizeWSpin->value();
+				double spinH = sizeHSpin->value();
+				
+				if ( fabs(spinW - mObject->w()) > fabs(spinH - mObject->h()) )
+				{
+					mObject->setWHonorAspect( spinW );
+					sizeHSpin->setValue( mObject->h() );
+				}
+				else
+				{
+					mObject->setHHonorAspect( spinH );
+					sizeWSpin->setValue( mObject->w() );
+				}
 			}
 			else
 			{