Rename "addWidget" to "addTab"
This commit is contained in:
@@ -123,7 +123,7 @@ void DockWidget::addDockWidgetAsTab(DockWidget *other, InitialOption option)
|
|||||||
}
|
}
|
||||||
|
|
||||||
other->setParentView(nullptr);
|
other->setParentView(nullptr);
|
||||||
group->addWidget(other, option);
|
group->addTab(other, option);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DockWidget::addDockWidgetToContainingWindow(DockWidget *other,
|
void DockWidget::addDockWidgetToContainingWindow(DockWidget *other,
|
||||||
@@ -559,7 +559,7 @@ Controllers::FloatingWindow *DockWidget::Private::morphIntoFloatingWindow()
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto group = new Controllers::Group();
|
auto group = new Controllers::Group();
|
||||||
group->addWidget(q);
|
group->addTab(q);
|
||||||
geo.setSize(geo.size().boundedTo(group->view()->maxSizeHint()));
|
geo.setSize(geo.size().boundedTo(group->view()->maxSizeHint()));
|
||||||
geo.setSize(geo.size().expandedTo(group->view()->minSize()));
|
geo.setSize(geo.size().expandedTo(group->view()->minSize()));
|
||||||
Controllers::FloatingWindow::ensureRectIsOnScreen(geo);
|
Controllers::FloatingWindow::ensureRectIsOnScreen(geo);
|
||||||
|
|||||||
@@ -190,11 +190,11 @@ void DropArea::addDockWidget(Controllers::DockWidget *dw, Location location,
|
|||||||
group = oldFrame;
|
group = oldFrame;
|
||||||
} else {
|
} else {
|
||||||
group = new Controllers::Group();
|
group = new Controllers::Group();
|
||||||
group->addWidget(dw);
|
group->addTab(dw);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
group = new Controllers::Group();
|
group = new Controllers::Group();
|
||||||
group->addWidget(dw);
|
group->addTab(dw);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (option.startsHidden()) {
|
if (option.startsHidden()) {
|
||||||
@@ -359,7 +359,7 @@ bool DropArea::drop(WindowBeingDragged *draggedWindow, Controllers::Group *accep
|
|||||||
qCDebug(hovering) << "Tabbing" << droppedWindow << "into" << acceptingFrame;
|
qCDebug(hovering) << "Tabbing" << droppedWindow << "into" << acceptingFrame;
|
||||||
if (!validateAffinity(droppedWindow, acceptingFrame))
|
if (!validateAffinity(droppedWindow, acceptingFrame))
|
||||||
return false;
|
return false;
|
||||||
acceptingFrame->addWidget(droppedWindow);
|
acceptingFrame->addTab(droppedWindow);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@@ -403,7 +403,7 @@ bool DropArea::drop(View *droppedWindow, KDDockWidgets::Location location, Contr
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
auto group = new Controllers::Group();
|
auto group = new Controllers::Group();
|
||||||
group->addWidget(dock);
|
group->addTab(dock);
|
||||||
addWidget(group->view(), location, relativeTo, DefaultSizeMode::FairButFloor);
|
addWidget(group->view(), location, relativeTo, DefaultSizeMode::FairButFloor);
|
||||||
} else if (auto floatingWindow = droppedWindow->asFloatingWindowController()) {
|
} else if (auto floatingWindow = droppedWindow->asFloatingWindowController()) {
|
||||||
if (!validateAffinity(floatingWindow))
|
if (!validateAffinity(floatingWindow))
|
||||||
@@ -571,7 +571,7 @@ void DropArea::addWidget(View *w, Location location,
|
|||||||
newItem = new Layouting::Item(thisView);
|
newItem = new Layouting::Item(thisView);
|
||||||
group = new Controllers::Group();
|
group = new Controllers::Group();
|
||||||
newItem->setGuestView(group->view());
|
newItem->setGuestView(group->view());
|
||||||
group->addWidget(dw, option);
|
group->addTab(dw, option);
|
||||||
} else if (auto ms = w->asDropAreaController()) {
|
} else if (auto ms = w->asDropAreaController()) {
|
||||||
newItem = ms->m_rootItem;
|
newItem = ms->m_rootItem;
|
||||||
newItem->setHostView(thisView);
|
newItem->setHostView(thisView);
|
||||||
|
|||||||
@@ -219,28 +219,28 @@ void Group::onDockWidgetTitleChanged()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Group::addWidget(DockWidget *dockWidget, InitialOption addingOption)
|
void Group::addTab(DockWidget *dockWidget, InitialOption addingOption)
|
||||||
{
|
{
|
||||||
insertWidget(dockWidget, dockWidgetCount(), addingOption); // append
|
insertWidget(dockWidget, dockWidgetCount(), addingOption); // append
|
||||||
}
|
}
|
||||||
|
|
||||||
void Group::addWidget(Group *group, InitialOption addingOption)
|
void Group::addTab(Group *group, InitialOption addingOption)
|
||||||
{
|
{
|
||||||
if (group->isEmpty()) {
|
if (group->isEmpty()) {
|
||||||
qWarning() << "Group::addWidget: group is empty." << group;
|
qWarning() << "Group::addTab: group is empty." << group;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto &docks = group->dockWidgets();
|
const auto &docks = group->dockWidgets();
|
||||||
for (DockWidget *dockWidget : docks)
|
for (DockWidget *dockWidget : docks)
|
||||||
addWidget(dockWidget, addingOption);
|
addTab(dockWidget, addingOption);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Group::addWidget(FloatingWindow *floatingWindow, InitialOption addingOption)
|
void Group::addTab(FloatingWindow *floatingWindow, InitialOption addingOption)
|
||||||
{
|
{
|
||||||
Q_ASSERT(floatingWindow);
|
Q_ASSERT(floatingWindow);
|
||||||
for (Group *f : floatingWindow->groups())
|
for (Group *f : floatingWindow->groups())
|
||||||
addWidget(f, addingOption);
|
addTab(f, addingOption);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Group::insertWidget(DockWidget *dockWidget, int index, InitialOption addingOption)
|
void Group::insertWidget(DockWidget *dockWidget, int index, InitialOption addingOption)
|
||||||
@@ -248,7 +248,7 @@ void Group::insertWidget(DockWidget *dockWidget, int index, InitialOption adding
|
|||||||
Q_ASSERT(dockWidget);
|
Q_ASSERT(dockWidget);
|
||||||
if (containsDockWidget(dockWidget)) {
|
if (containsDockWidget(dockWidget)) {
|
||||||
if (!dockWidget->isPersistentCentralDockWidget())
|
if (!dockWidget->isPersistentCentralDockWidget())
|
||||||
qWarning() << "Group::addWidget dockWidget already exists. this=" << this << "; dockWidget=" << dockWidget;
|
qWarning() << "Group::addTab dockWidget already exists. this=" << this << "; dockWidget=" << dockWidget;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (m_layoutItem)
|
if (m_layoutItem)
|
||||||
@@ -299,7 +299,7 @@ FloatingWindow *Group::detachTab(DockWidget *dockWidget)
|
|||||||
|
|
||||||
auto newFrame = new Group();
|
auto newFrame = new Group();
|
||||||
const QPoint globalPoint = mapToGlobal(QPoint(0, 0));
|
const QPoint globalPoint = mapToGlobal(QPoint(0, 0));
|
||||||
newFrame->addWidget(dockWidget);
|
newFrame->addTab(dockWidget);
|
||||||
|
|
||||||
// We're potentially already dead at this point, as groups with 0 tabs auto-destruct. Don't access members from this point.
|
// We're potentially already dead at this point, as groups with 0 tabs auto-destruct. Don't access members from this point.
|
||||||
|
|
||||||
@@ -743,7 +743,7 @@ Group *Group::deserialize(const LayoutSaver::Group &f)
|
|||||||
|
|
||||||
for (const auto &savedDock : qAsConst(f.dockWidgets)) {
|
for (const auto &savedDock : qAsConst(f.dockWidgets)) {
|
||||||
if (DockWidget *dw = DockWidget::deserialize(savedDock)) {
|
if (DockWidget *dw = DockWidget::deserialize(savedDock)) {
|
||||||
group->addWidget(dw);
|
group->addTab(dw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,12 +51,12 @@ public:
|
|||||||
static Group *deserialize(const LayoutSaver::Group &);
|
static Group *deserialize(const LayoutSaver::Group &);
|
||||||
LayoutSaver::Group serialize() const;
|
LayoutSaver::Group serialize() const;
|
||||||
|
|
||||||
///@brief Adds a widget into the Group's TabWidget
|
///@brief Adds a widget into the Group's Stack
|
||||||
void addWidget(DockWidget *, InitialOption = {});
|
void addTab(DockWidget *, InitialOption = {});
|
||||||
///@overload
|
///@overload
|
||||||
void addWidget(Group *, InitialOption = {});
|
void addTab(Group *, InitialOption = {});
|
||||||
///@overload
|
///@overload
|
||||||
void addWidget(FloatingWindow *floatingWindow, InitialOption = {});
|
void addTab(FloatingWindow *floatingWindow, InitialOption = {});
|
||||||
|
|
||||||
///@brief Inserts a widget into the Group's TabWidget at @p index
|
///@brief Inserts a widget into the Group's TabWidget at @p index
|
||||||
void insertWidget(DockWidget *, int index, InitialOption = {});
|
void insertWidget(DockWidget *, int index, InitialOption = {});
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ void Layout::restorePlaceholder(Controllers::DockWidget *dw, Layouting::Item *it
|
|||||||
if (tabIndex != -1 && group->dockWidgetCount() >= tabIndex) {
|
if (tabIndex != -1 && group->dockWidgetCount() >= tabIndex) {
|
||||||
group->insertWidget(dw, tabIndex);
|
group->insertWidget(dw, tabIndex);
|
||||||
} else {
|
} else {
|
||||||
group->addWidget(dw);
|
group->addTab(dw);
|
||||||
}
|
}
|
||||||
|
|
||||||
group->setVisible(true);
|
group->setVisible(true);
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ void MDILayout::addDockWidget(Controllers::DockWidget *dw, QPoint localPt, Initi
|
|||||||
newItem->setGuestView(group->view());
|
newItem->setGuestView(group->view());
|
||||||
} else {
|
} else {
|
||||||
group = new Controllers::Group();
|
group = new Controllers::Group();
|
||||||
group->addWidget(dw, addingOption);
|
group->addTab(dw, addingOption);
|
||||||
|
|
||||||
newItem->setGuestView(group->view());
|
newItem->setGuestView(group->view());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public:
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
group->addWidget(dw);
|
group->addTab(dw);
|
||||||
return dw;
|
return dw;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,7 +184,7 @@ void MainWindow::addDockWidgetAsTab(Controllers::DockWidget *widget)
|
|||||||
<< "MainWindowOption_HasCentralWidget can only have 1 widget in the center."
|
<< "MainWindowOption_HasCentralWidget can only have 1 widget in the center."
|
||||||
<< "Use MainWindowOption_HasCentralFrame instead, which is similar but supports tabbing";
|
<< "Use MainWindowOption_HasCentralFrame instead, which is similar but supports tabbing";
|
||||||
} else if (d->supportsCentralFrame()) {
|
} else if (d->supportsCentralFrame()) {
|
||||||
dropArea()->m_centralFrame->addWidget(widget);
|
dropArea()->m_centralFrame->addTab(widget);
|
||||||
} else {
|
} else {
|
||||||
qWarning() << Q_FUNC_INFO << "Not supported without MainWindowOption_HasCentralFrame";
|
qWarning() << Q_FUNC_INFO << "Not supported without MainWindowOption_HasCentralFrame";
|
||||||
}
|
}
|
||||||
@@ -588,7 +588,7 @@ void MainWindow::overlayOnSideBar(Controllers::DockWidget *dw)
|
|||||||
auto group = new Controllers::Group(nullptr, FrameOption_IsOverlayed);
|
auto group = new Controllers::Group(nullptr, FrameOption_IsOverlayed);
|
||||||
group->setParentView(view());
|
group->setParentView(view());
|
||||||
d->m_overlayedDockWidget = dw;
|
d->m_overlayedDockWidget = dw;
|
||||||
group->addWidget(dw);
|
group->addTab(dw);
|
||||||
d->updateOverlayGeometry(dw->d->lastPosition()->lastOverlayedGeometry(sb->location()).size());
|
d->updateOverlayGeometry(dw->d->lastPosition()->lastOverlayedGeometry(sb->location()).size());
|
||||||
|
|
||||||
group->setAllowedResizeSides(d->allowedResizeSides(sb->location()));
|
group->setAllowedResizeSides(d->allowedResizeSides(sb->location()));
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ void KDDockWidgets::Tests::moveMouseTo(QPoint globalDest, View *receiver)
|
|||||||
void KDDockWidgets::Tests::nestDockWidget(Controllers::DockWidget *dock, DropArea *dropArea, Controllers::Group *relativeTo, Location location)
|
void KDDockWidgets::Tests::nestDockWidget(Controllers::DockWidget *dock, DropArea *dropArea, Controllers::Group *relativeTo, Location location)
|
||||||
{
|
{
|
||||||
auto group = new Controllers::Group();
|
auto group = new Controllers::Group();
|
||||||
group->addWidget(dock);
|
group->addTab(dock);
|
||||||
dock->d->group()->setObjectName(dock->objectName());
|
dock->d->group()->setObjectName(dock->objectName());
|
||||||
|
|
||||||
dropArea->addWidget(group->view(), location, relativeTo);
|
dropArea->addWidget(group->view(), location, relativeTo);
|
||||||
|
|||||||
Reference in New Issue
Block a user