Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 13281 → Rev 13282

/trunk/Scribus/scribus/scribusview.cpp
1742,7 → 1742,8
void ScribusView::dragTimerTimeOut()
{
m_dragTimerFired = true;
qApp->changeOverrideCursor(QCursor(loadIcon("DragPix.xpm")));
// #0007865
// qApp->changeOverrideCursor(QCursor(loadIcon("DragPix.xpm")));
}
 
void ScribusView::HandleCurs(PageItem *currItem, QRect mpo)
/trunk/Scribus/scribus/canvasmode_normal.cpp
290,7 → 290,10
{
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_view->dragTimerElapsed()) && (m->buttons() & Qt::LeftButton)) || (m_view->moveTimerElapsed() && (m->buttons() & Qt::RightButton)))
// #0007865
if (/*(((m_view->dragTimerElapsed()) && (m->buttons() & Qt::LeftButton)) ||*/
(m_view->moveTimerElapsed())
&& (m->buttons() & Qt::RightButton)
&& (m_canvas->m_viewMode.m_MouseButtonPressed)
&& (!m_doc->DragP)
&& (!(currItem->isSingleSel)))