Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 12905 → Rev 12904

/trunk/Scribus/scribus/canvasmode_normal.cpp
805,6 → 805,10
{
qApp->changeOverrideCursor(QCursor(Qt::OpenHandCursor));
}
if (m_doc->appMode == modeRotation)
{
qApp->changeOverrideCursor(QCursor(loadIcon("Rotieren2.png")));
}
}
else
{
860,7 → 864,10
if ((m_canvas->m_viewMode.m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton) && (GyM == -1) && (GxM == -1))
{
newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
if (m_doc->appMode == modeMagnifier)
newY = qRound(Myp + ((SeRx - Mxp) * m_view->visibleHeight()) / m_view->visibleWidth());
else
newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
if (m_doc->appMode == modeDrawTable)
{
FPoint np2 = m_doc->ApplyGridF(FPoint(newX, newY));
1124,7 → 1131,8
//m_canvas->update(); //ugly in a mouseReleaseEvent!!!!!!!
if (m_doc->appMode == modePanning)
{
m_ScMW->setAppMode(modeNormal);
if ((m->buttons() & Qt::RightButton) && (m->modifiers() & Qt::ControlModifier))
m_ScMW->setAppMode(modeNormal);
return;
}
if ((!GetItem(&currItem)) && (m->button() == Qt::RightButton) && (!m_doc->DragP))