Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 5241 → Rev 5242

/branches/Version13x/Scribus/scribus/pageitem.cpp
1787,7 → 1787,7
if (UndoManager::undoEnabled())
{
SimpleState *ss;
if (m_Locked)
if (m_SizeLocked)
ss = new SimpleState(Um::SizeUnLock, 0, Um::IUnLock);
else
ss = new SimpleState(Um::SizeLock, 0, Um::ILock);
/branches/Version13x/Scribus/scribus/scribusview.cpp
5089,30 → 5089,33
Transform(currItem, &p);
Doc->RotMode = 2;
RCenter = FPoint(currItem->xPos()+currItem->width()/2, currItem->yPos()+currItem->height()/2, 0, 0, currItem->rotation(), 1, 1, true);
// if (!currItem->asLine())
// {
if (QRegion(p.xForm(QPointArray(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height()))))).contains(mpo))
{
if (p.xForm(QRect(static_cast<int>(currItem->width())-6, static_cast<int>(currItem->height())-6, 6, 6)).intersects(mpo))
{
RCenter = FPoint(currItem->xPos(), currItem->yPos());
Doc->RotMode = 0;
}
if (p.xForm(QRect(0, 0, 6, 6)).intersects(mpo))
{
RCenter = FPoint(currItem->xPos()+currItem->width(), currItem->yPos()+currItem->height(), 0, 0, currItem->rotation(), 1, 1, true);
Doc->RotMode = 4;
}
if (p.xForm(QRect(0, static_cast<int>(currItem->height())-6, 6, 6)).intersects(mpo))
else if (p.xForm(QRect(static_cast<int>(currItem->width())-6, 0, 6, 6)).intersects(mpo))
{
RCenter = FPoint(currItem->xPos(), currItem->yPos()+currItem->height(), 0, 0, currItem->rotation(), 1, 1, true);
Doc->RotMode = 3;
}
else if (p.xForm(QRect(static_cast<int>(currItem->width())-6, static_cast<int>(currItem->height())-6, 6, 6)).intersects(mpo))
{
RCenter = FPoint(currItem->xPos(), currItem->yPos());
Doc->RotMode = 0;
}
else if (p.xForm(QRect(0, static_cast<int>(currItem->height())-6, 6, 6)).intersects(mpo))
{
RCenter = FPoint(currItem->xPos()+currItem->width(), currItem->yPos(), 0, 0, currItem->rotation(), 1, 1, true);
Doc->RotMode = 1;
}
if (p.xForm(QRect(static_cast<int>(currItem->width())-6, 0, 6, 6)).intersects(mpo))
{
RCenter = FPoint(currItem->xPos(), currItem->yPos()+currItem->height(), 0, 0, currItem->rotation(), 1, 1, true);
Doc->RotMode = 3;
}
// }
oldW = xy2Deg(m->x()/Scale - RCenter.x(), m->y()/Scale - RCenter.y());
}
p.end();
}
}
6965,7 → 6968,7
if (currItem->locked())
return;
QRect oldR(currItem->getRedrawBounding(Scale));
if ((Doc->RotMode != 0) && !(currItem->asLine()))
if ((Doc->RotMode != 0) && (m_MouseButtonPressed))
{
QWMatrix ma;
ma.translate(currItem->xPos(), currItem->yPos());
/branches/Version13x/Scribus/scribus/scribus.cpp
2685,10 → 2685,10
scrActions["toolsEditWithStoryEditor"]->setEnabled(false);
scrActions["toolsUnlinkTextFrame"]->setEnabled(false);
scrActions["toolsLinkTextFrame"]->setEnabled(false);
if (Nr != 5)
// if (Nr != 5)
scrActions["toolsRotate"]->setEnabled(true);
else
scrActions["toolsRotate"]->setEnabled(false);
// else
// scrActions["toolsRotate"]->setEnabled(false);
scrActions["toolsCopyProperties"]->setEnabled(true);
break;
}