Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 24601 → Rev 24600

/branches/Version156/Scribus/scribus/scribusview.cpp
774,19 → 774,17
m_doc->m_Selection->delaySignalsOn();
for (int i = m_doc->Items->count() - 1; i >= 0 ; --i)
{
PageItem* item = m_doc->Items->at(i);
if (item->m_layerID != m_doc->activeLayer())
continue;
if ((m_doc->masterPageMode()) && (!((item->OwnPage == -1) || (item->OwnPage == m_doc->currentPage()->pageNr()))))
continue;
if (m_canvas->frameHitTest(dropPosDocQ, item) >= Canvas::INSIDE)
if (m_doc->Items->at(i)->m_layerID==m_doc->activeLayer())
{
if (m_canvas->frameHitTest(dropPosDocQ, m_doc->Items->at(i)) >= Canvas::INSIDE)
{
deselectItems(false);
m_doc->m_Selection->addItem(item);
m_doc->m_Selection->addItem(m_doc->Items->at(i));
selectedItemByDrag = true;
break;
}
}
}
m_doc->m_Selection->delaySignalsOff();
 
QStringList imfo;
876,13 → 874,10
m_doc->m_Selection->delaySignalsOn();
for (int i = m_doc->Items->count() - 1; i >= 0 ; --i)
{
PageItem* item = m_doc->Items->at(i);
if (item->m_layerID != m_doc->activeLayer())
continue;
if ((m_doc->masterPageMode()) && (!((item->OwnPage == -1) || (item->OwnPage == m_doc->currentPage()->pageNr()))))
continue;
if ((m_canvas->frameHitTest(dropPosDocQ, m_doc->Items->at(i)) >= Canvas::INSIDE) && (item->itemType() == PageItem::Symbol))
if (m_doc->Items->at(i)->m_layerID==m_doc->activeLayer())
{
if ((m_canvas->frameHitTest(dropPosDocQ, m_doc->Items->at(i)) >= Canvas::INSIDE) && (m_doc->Items->at(i)->itemType() == PageItem::Symbol))
{
deselectItems(false);
m_doc->m_Selection->addItem(m_doc->Items->at(i));
m_doc->Items->at(i)->setPattern(patternVal);
890,6 → 885,7
break;
}
}
}
m_doc->m_Selection->delaySignalsOff();
if (!selectedItemByDrag)
{