Author: jghali
Date: Wed Mar 18 12:00:14 2020
New Revision: 23510
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23510
Log:
Make ScribusDoc::itemSelection_GroupObjects() more robust against presence in
selection of already grouped items
Modified:
trunk/Scribus/scribus/scribusdoc.cpp
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23510&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Mar 18 12:00:14 2020
@@ -15129,13 +15129,29 @@
if (objectsLayer == -1)
return nullptr;
PageItem *currItem;
- double x, y, w, h;
+
+ // Remove from selection any item which may already be grouped
+ QList<PageItem*> selectedItems = itemSelection->items();
+ for (int i = 0; i < selectedItems.count(); ++i)
+ {
+ currItem = selectedItems.at(i);
+ if (currItem->Parent)
+ {
+ selectedItems.removeAt(i);
+ --i;
+ }
+ }
+
+ int selectedItemCount = selectedItems.count();
+ if (selectedItemCount <= 1)
+ return nullptr;
+
+ // Sort selection so as to preserve item levels
+ std::stable_sort(selectedItems.begin(), selectedItems.end(),
compareItemLevel);
+
UndoTransaction activeTransaction;
if (UndoManager::undoEnabled())
activeTransaction =
m_undoManager->beginTransaction(Um::Selection, Um::IGroup, Um::Group, "",
Um::IGroup);
- QList<PageItem*> selectedItems = itemSelection->items();
- std::stable_sort(selectedItems.begin(), selectedItems.end(),
compareItemLevel);
- int selectedItemCount = selectedItems.count();
QString tooltip = Um::ItemsInvolved + "\n";
if (selectedItemCount > Um::ItemsInvolvedLimit)
tooltip = Um::ItemsInvolved2 + "\n";
@@ -15149,7 +15165,12 @@
tooltip += "\t" + currItem->getUName() + "\n";
}
}
- itemSelection->getVisualGroupRect(&x, &y, &w, &h);
+
+ double x, y, w, h;
+ Selection tempSelection(this, false);
+ tempSelection.addItems(selectedItems);
+ tempSelection.getVisualGroupRect(&x, &y, &w, &h);
+
int lowestItem = std::numeric_limits<int>::max();
for (int i = 0; i < selectedItemCount; ++i)
{
@@ -15201,8 +15222,8 @@
{
ScItemState<QList<QPointer<PageItem> > > *is = new
ScItemState<QList<QPointer<PageItem> > >(UndoManager::Group);
is->set("GROUP");
- itemSelection->addItem(groupItem,true);
- is->setItem(itemSelection->selectionList());
+ tempSelection.addItem(groupItem, true);
+ is->setItem(tempSelection.selectionList());
m_undoManager->action(this, is);
}
if (activeTransaction)
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
