philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when moving separator

Browse Source 
We weren't recurring up the tree to find the next separator
This commit is contained in:
Sergio Martins
2020-05-19 14:46:30 +01:00
parent af22e3e12d
commit 6001e655fd
3 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/private/multisplitter/Item.cpp
View File

@@ -2020,8 +2020,11 @@ void ItemContainer::requestSeparatorMove(Separator *separator, int delta)
const int max = maxPosForSeparator_global(separator);
if (pos + delta < min || pos + delta > max) {
root()->dumpLayout();
qWarning() << "Separator would have gone out of bounds"
<< separator << min << pos << max << delta;
<< "; separators=" << separator
<< "; min=" << min << "; pos=" << pos
<< "; max=" << max << "; delta=" << delta;
return;
}
@@ -2073,7 +2076,13 @@ void ItemContainer::requestSeparatorMove(Separator *separator, int delta)
qWarning() << Q_FUNC_INFO << "Not enough space to move separator"
<< this;
} else {
Separator *nextSeparator = parentContainer()->neighbourSeparator(this, moveDirection, m_orientation);
Separator *nextSeparator = parentContainer()->neighbourSeparator_recursive(this, moveDirection, m_orientation);
if (!nextSeparator) {
// Doesn't happen
qWarning() << Q_FUNC_INFO << "nextSeparator is null, report a bug";
return;
}
// nextSeparator might not belong to parentContainer(), due to different orientation
const int remainingDelta = moveDirection == Side1 ? -remainingToTake : remainingToTake;
nextSeparator->parentContainer()->requestSeparatorMove(nextSeparator, remainingDelta);
@@ -2965,6 +2974,19 @@ Separator *ItemContainer::neighbourSeparator(const Item *item, Side side, Qt::Or
return m_separators[separatorIndex];
}
Separator *ItemContainer::neighbourSeparator_recursive(const Item *item, Side side,
Qt::Orientation orientation) const
{
Separator *separator = neighbourSeparator(item, side, orientation);
if (separator)
return separator;
if (!parentContainer())
return nullptr;
return parentContainer()->neighbourSeparator_recursive(this, side, orientation);
}
void ItemContainer::updateWidgets_recursive()
{
for (Item *item : m_children) {