Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 8093 → Rev 8092

/branches/Version13x/Scribus/scribus/scribusview.cpp
5103,22 → 5103,49
}
if (!(currItem->isTableItem && currItem->isSingleSel))
{
Doc->m_Selection->setGroupRect();
double gx, gy, gh, gw;
Doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
moveGroup(dX, dY, false);
if (Doc->SnapGuides)
{
double nx = gx;
double ny = gy;
double nx = currItem->xPos();
double ny = currItem->yPos();
Doc->ApplyGuides(&nx, &ny);
moveGroup(nx-gx, ny-gy, false);
Doc->m_Selection->setGroupRect();
Doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
nx = gx+gw;
ny = gy+gh;
moveGroup(nx-currItem->xPos(), ny-currItem->yPos(), false);
QWMatrix ma;
ma.translate(currItem->xPos(), currItem->yPos());
ma.rotate(currItem->rotation());
if (currItem->asLine())
{
nx = ma.m11() * currItem->width() + ma.dx();
ny = ma.m12() * currItem->width() + ma.dy();
}
else
{
nx = ma.m11() * currItem->width() + ma.m21() * currItem->height() + ma.dx();
ny = ma.m22() * currItem->height() + ma.m12() * currItem->width() + ma.dy();
}
double nxo = nx;
double nyo = ny;
Doc->ApplyGuides(&nx, &ny);
moveGroup(nx-(gx+gw), ny-(gy+gh), false);
moveGroup(nx-nxo, ny-nyo, false);
if ((currItem->rotation() != 0.0) && (!currItem->asLine()))
{
nx = ma.m11() * currItem->width() + ma.dx();
ny = ma.m12() * currItem->width() + ma.dy();
nxo = nx;
nyo = ny;
Doc->ApplyGuides(&nx, &ny);
moveGroup(nx-nxo, ny-nyo, false);
nx = ma.m21() * currItem->height() + ma.dx();
ny = ma.m22() * currItem->height() + ma.dy();
nxo = nx;
nyo = ny;
Doc->ApplyGuides(&nx, &ny);
moveGroup(nx-nxo, ny-nyo, false);
}
// nx = currItem->xPos()+currItem->width();
// ny = currItem->yPos()+currItem->height();
// Doc->ApplyGuides(&nx, &ny);
// moveGroup(nx-(currItem->xPos()+currItem->width()), ny-(currItem->yPos()+currItem->height()), false);
}
if (Doc->useRaster)
{
5142,6 → 5169,7
}
}
}
//erf = true;
}
else
{
5148,6 → 5176,8
Doc->m_Selection->setGroupRect();
double gx, gy, gh, gw;
Doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
// double gxs, gys, ghs, gws;
// getGroupRectScreen(&gxs, &gys, &gws, &ghs);
int dX=newX-Mxp, dY=newY-Myp;
erf = true;
if (m->state() & ControlButton)
5176,6 → 5206,7
moveGroup(nx-(gx+gw), ny-(gy+gh), false);
}
Doc->m_Selection->setGroupRect();
// Doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
if (Doc->useRaster)
{
Doc->m_Selection->setGroupRect();
5197,6 → 5228,7
moveGroup(gx-gxo, gy-gyo, false);
Doc->m_Selection->setGroupRect();
}
//erf = true;
}
if (erf)
{