r17151 by jghali - #10467 : incorrect update of X and Y in PP when moving multiple objects with arrow keys
scribus-commit
scribus-commit at lists.scribus.net
Fri Dec 30 15:22:05 UTC 2011
Author: jghali
Date: Fri Dec 30 15:22:05 2011
New Revision: 17151
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17151
Log:
#10467 : incorrect update of X and Y in PP when moving multiple objects with arrow keys
Modified:
branches/Version135/Scribus/scribus/scribus.cpp
Modified: branches/Version135/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17151&path=/branches/Version135/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribus.cpp (original)
+++ branches/Version135/Scribus/scribus/scribus.cpp Fri Dec 30 15:22:05 2011
@@ -1627,6 +1627,14 @@
doc->SizeItem(currItem->width() + resizeBy, currItem->height(), currItem->ItemNr);
}
}
+ if (doc->m_Selection->count() > 1)
+ {
+ double x, y, w, h;
+ doc->m_Selection->setGroupRect();
+ doc->m_Selection->getGroupRect(&x, &y, &w, &h);
+ propertiesPalette->setXY(x, y);
+ propertiesPalette->setBH(w, h);
+ }
currItem->update();
slotDocCh();
}
@@ -1695,6 +1703,14 @@
currItem->Sizing = false;
doc->SizeItem(currItem->width() + resizeBy, currItem->height(), currItem->ItemNr);
}
+ }
+ if (doc->m_Selection->count() > 1)
+ {
+ double x, y, w, h;
+ doc->m_Selection->setGroupRect();
+ doc->m_Selection->getGroupRect(&x, &y, &w, &h);
+ propertiesPalette->setXY(x, y);
+ propertiesPalette->setBH(w, h);
}
currItem->update();
slotDocCh();
@@ -1765,6 +1781,14 @@
doc->SizeItem(currItem->width(), currItem->height() + resizeBy, currItem->ItemNr);
}
}
+ if (doc->m_Selection->count() > 1)
+ {
+ double x, y, w, h;
+ doc->m_Selection->setGroupRect();
+ doc->m_Selection->getGroupRect(&x, &y, &w, &h);
+ propertiesPalette->setXY(x, y);
+ propertiesPalette->setBH(w, h);
+ }
currItem->update();
slotDocCh();
}
@@ -1834,6 +1858,14 @@
doc->SizeItem(currItem->width(), currItem->height() + resizeBy, currItem->ItemNr);
}
}
+ if (doc->m_Selection->count() > 1)
+ {
+ double x, y, w, h;
+ doc->m_Selection->setGroupRect();
+ doc->m_Selection->getGroupRect(&x, &y, &w, &h);
+ propertiesPalette->setXY(x, y);
+ propertiesPalette->setBH(w, h);
+ }
currItem->update();
slotDocCh();
}
@@ -4163,6 +4195,8 @@
}
// RestoreBookMarks();
doc->setMasterPageMode(false);
+ /*QTime t;
+ t.start();*/
int docItemsCount=doc->Items->count();
for (int azz=0; azz<docItemsCount; ++azz)
{
@@ -4196,6 +4230,7 @@
if(ite->nextInChain() == NULL)
ite->layout();
}
+ /*qDebug("Time elapsed: %d ms", t.elapsed());*/
// if (doc->OldBM)
// StoreBookmarks();
doc->RePos = false;
More information about the scribus-commit
mailing list