Commit 7494946e authored by Scott Petrovic's avatar Scott Petrovic

BUG:345561 lock proportions with free transform tool dragging while scaling

parent b8ca5af4
......@@ -486,7 +486,7 @@ void KisFreeTransformStrategy::continuePrimaryAction(const QPointF &mousePos, bo
movingPoint,
dist);
if (specialModifierActive) {
if (specialModifierActive || m_d->currentArgs.keepAspectRatio()) {
qreal aspectRatio = m_d->clickArgs.scaleX() / m_d->clickArgs.scaleY();
m_d->currentArgs.setScaleX(aspectRatio * result.scale);
}
......@@ -529,7 +529,7 @@ void KisFreeTransformStrategy::continuePrimaryAction(const QPointF &mousePos, bo
movingPoint,
dist);
if (specialModifierActive) {
if (specialModifierActive || m_d->currentArgs.keepAspectRatio()) {
qreal aspectRatio = m_d->clickArgs.scaleY() / m_d->clickArgs.scaleX();
m_d->currentArgs.setScaleY(aspectRatio * result.scale);
}
......@@ -562,7 +562,7 @@ void KisFreeTransformStrategy::continuePrimaryAction(const QPointF &mousePos, bo
QPointF staticPointInView = m_d->transform.map(staticPoint);
QPointF movingPointInView = mousePos;
if (specialModifierActive) {
if (specialModifierActive || m_d->currentArgs.keepAspectRatio()) {
KisTransformUtils::MatricesPack m(m_d->clickArgs);
QTransform t = m.finalTransform();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment