Hooked up rect size controls in object editor.

This commit is contained in:
Jim Evins
2015-08-19 14:49:02 -04:00
parent c4ceb8c14d
commit 0834d158ed
4 changed files with 78 additions and 37 deletions
+6 -15
View File
@@ -23,6 +23,7 @@
#include <QTransform>
#include <QFont>
#include <algorithm>
#include <cmath>
#include <QtDebug>
#include "ColorNode.h"
@@ -171,7 +172,7 @@ namespace glabels
if ( mW != value )
{
mW = value;
emit moved();
emit changed();
}
}
@@ -193,7 +194,7 @@ namespace glabels
if ( mH != value )
{
mH = value;
emit moved();
emit changed();
}
}
@@ -778,23 +779,13 @@ namespace glabels
///
void LabelModelObject::setSizeHonorAspect( double w, double h )
{
double aspectRatio = mH / mW;
if ( h > (w * aspectRatio) )
if ( fabs(w - mW) > fabs(h - mH) )
{
h = w * aspectRatio;
setWHonorAspect( w );
}
else
{
w = h / aspectRatio;
}
if ( ( mW != w ) || ( mH != h ) )
{
mW = w;
mH = h;
emit changed();
setHHonorAspect( h );
}
}