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

Rename "addWidget" to "addTab"

Browse Source
This commit is contained in:
Sergio Martins
2022-07-31 23:03:16 +01:00
parent 45ad75fcd4
commit e4b2d37f96
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/DockWidget.cpp
View File

@@ -123,7 +123,7 @@ void DockWidget::addDockWidgetAsTab(DockWidget *other, InitialOption option)
}
other->setParentView(nullptr);
group->addWidget(other, option);
group->addTab(other, option);
}
void DockWidget::addDockWidgetToContainingWindow(DockWidget *other,
@@ -559,7 +559,7 @@ Controllers::FloatingWindow *DockWidget::Private::morphIntoFloatingWindow()
}
auto group = new Controllers::Group();
group->addWidget(q);
group->addTab(q);
geo.setSize(geo.size().boundedTo(group->view()->maxSizeHint()));
geo.setSize(geo.size().expandedTo(group->view()->minSize()));
Controllers::FloatingWindow::ensureRectIsOnScreen(geo);

10
src/controllers/DropArea.cpp
View File

@@ -190,11 +190,11 @@ void DropArea::addDockWidget(Controllers::DockWidget *dw, Location location,
group = oldFrame;
} else {
group = new Controllers::Group();
group->addWidget(dw);
group->addTab(dw);
}
} else {
group = new Controllers::Group();
group->addWidget(dw);
group->addTab(dw);
}
if (option.startsHidden()) {
@@ -359,7 +359,7 @@ bool DropArea::drop(WindowBeingDragged *draggedWindow, Controllers::Group *accep
qCDebug(hovering) << "Tabbing" << droppedWindow << "into" << acceptingFrame;
if (!validateAffinity(droppedWindow, acceptingFrame))
return false;
acceptingFrame->addWidget(droppedWindow);
acceptingFrame->addTab(droppedWindow);
break;
default:
@@ -403,7 +403,7 @@ bool DropArea::drop(View *droppedWindow, KDDockWidgets::Location location, Contr
return false;
auto group = new Controllers::Group();
group->addWidget(dock);
group->addTab(dock);
addWidget(group->view(), location, relativeTo, DefaultSizeMode::FairButFloor);
} else if (auto floatingWindow = droppedWindow->asFloatingWindowController()) {
if (!validateAffinity(floatingWindow))
@@ -571,7 +571,7 @@ void DropArea::addWidget(View *w, Location location,
newItem = new Layouting::Item(thisView);
group = new Controllers::Group();
newItem->setGuestView(group->view());
group->addWidget(dw, option);
group->addTab(dw, option);
} else if (auto ms = w->asDropAreaController()) {
newItem = ms->m_rootItem;
newItem->setHostView(thisView);

18
src/controllers/Group.cpp
View File

@@ -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
}
void Group::addWidget(Group *group, InitialOption addingOption)
void Group::addTab(Group *group, InitialOption addingOption)
{
if (group->isEmpty()) {
qWarning() << "Group::addWidget: group is empty." << group;
qWarning() << "Group::addTab: group is empty." << group;
return;
}
const auto &docks = group->dockWidgets();
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);
for (Group *f : floatingWindow->groups())
addWidget(f, addingOption);
addTab(f, 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);
if (containsDockWidget(dockWidget)) {
if (!dockWidget->isPersistentCentralDockWidget())
qWarning() << "Group::addWidget dockWidget already exists. this=" << this << "; dockWidget=" << dockWidget;
qWarning() << "Group::addTab dockWidget already exists. this=" << this << "; dockWidget=" << dockWidget;
return;
}
if (m_layoutItem)
@@ -299,7 +299,7 @@ FloatingWindow *Group::detachTab(DockWidget *dockWidget)
auto newFrame = new Group();
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.
@@ -743,7 +743,7 @@ Group *Group::deserialize(const LayoutSaver::Group &f)
for (const auto &savedDock : qAsConst(f.dockWidgets)) {
if (DockWidget *dw = DockWidget::deserialize(savedDock)) {
group->addWidget(dw);
group->addTab(dw);
}
}

8
src/controllers/Group.h
View File

@@ -51,12 +51,12 @@ public:
static Group *deserialize(const LayoutSaver::Group &);
LayoutSaver::Group serialize() const;
///@brief Adds a widget into the Group's TabWidget
void addWidget(DockWidget *, InitialOption = {});
///@brief Adds a widget into the Group's Stack
void addTab(DockWidget *, InitialOption = {});
///@overload
void addWidget(Group *, InitialOption = {});
void addTab(Group *, InitialOption = {});
///@overload
void addWidget(FloatingWindow *floatingWindow, InitialOption = {});
void addTab(FloatingWindow *floatingWindow, InitialOption = {});
///@brief Inserts a widget into the Group's TabWidget at @p index
void insertWidget(DockWidget *, int index, InitialOption = {});

2
src/controllers/Layout.cpp
View File

@@ -160,7 +160,7 @@ void Layout::restorePlaceholder(Controllers::DockWidget *dw, Layouting::Item *it
if (tabIndex != -1 && group->dockWidgetCount() >= tabIndex) {
group->insertWidget(dw, tabIndex);
} else {
group->addWidget(dw);
group->addTab(dw);
}
group->setVisible(true);

2
src/controllers/MDILayout.cpp
View File

@@ -49,7 +49,7 @@ void MDILayout::addDockWidget(Controllers::DockWidget *dw, QPoint localPt, Initi
newItem->setGuestView(group->view());
} else {
group = new Controllers::Group();
group->addWidget(dw, addingOption);
group->addTab(dw, addingOption);
newItem->setGuestView(group->view());
}

6
src/controllers/MainWindow.cpp
View File

@@ -95,7 +95,7 @@ public:
return nullptr;
}
group->addWidget(dw);
group->addTab(dw);
return dw;
}
@@ -184,7 +184,7 @@ void MainWindow::addDockWidgetAsTab(Controllers::DockWidget *widget)
<< "MainWindowOption_HasCentralWidget can only have 1 widget in the center."
<< "Use MainWindowOption_HasCentralFrame instead, which is similar but supports tabbing";
} else if (d->supportsCentralFrame()) {
dropArea()->m_centralFrame->addWidget(widget);
dropArea()->m_centralFrame->addTab(widget);
} else {
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);
group->setParentView(view());
d->m_overlayedDockWidget = dw;
group->addWidget(dw);
group->addTab(dw);
d->updateOverlayGeometry(dw->d->lastPosition()->lastOverlayedGeometry(sb->location()).size());
group->setAllowedResizeSides(d->allowedResizeSides(sb->location()));

2
tests/utils.cpp
View File

@@ -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)
{
auto group = new Controllers::Group();
group->addWidget(dock);
group->addTab(dock);
dock->d->group()->setObjectName(dock->objectName());
dropArea->addWidget(group->view(), location, relativeTo);