This commit is contained in:
Sergio Martins
2020-04-23 22:49:04 +01:00
parent 2eebecb561
commit 9107a2f7fe
2 changed files with 9 additions and 5 deletions

View File

@@ -778,10 +778,10 @@ void ItemContainer::removeItem(Item *item, bool hardRemove)
if (!isContainer)
Q_EMIT root()->numItemsChanged();
} else {
if (wasVisible) {
item->setIsVisible(false);
item->setFrame(nullptr);
} else if (!isContainer) {
item->setIsVisible(false);
item->setFrame(nullptr);
if (!wasVisible && !isContainer) {
// Was already hidden
return;
}

View File

@@ -167,11 +167,12 @@ void MultiSplitterLayout::addWidget(QWidgetOrQuick *w, Location location, Frame
Frame::List frames = framesFrom(w);
unrefOldPlaceholders(frames);
auto dw = qobject_cast<DockWidgetBase*>(w);
if (frame) {
newItem = new Item(multiSplitter());
newItem->setFrame(frame);
} else if (auto dw = qobject_cast<DockWidgetBase*>(w)) {
} else if (dw) {
newItem = new Item(multiSplitter());
frame = new Frame();
newItem->setFrame(frame);
@@ -185,6 +186,9 @@ void MultiSplitterLayout::addWidget(QWidgetOrQuick *w, Location location, Frame
Q_ASSERT(!newItem->geometry().isEmpty());
relativeTo->insertItem(newItem, Layouting::Location(location), Layouting::AddingOption(option));
if (dw && option && AddingOption_StartHidden)
delete frame;
}
QString MultiSplitterLayout::affinityName() const