diff --git a/src/KDDockWidgets.h b/src/KDDockWidgets.h index 1185d770..155eb1a2 100644 --- a/src/KDDockWidgets.h +++ b/src/KDDockWidgets.h @@ -65,15 +65,6 @@ namespace KDDockWidgets }; Q_DECLARE_FLAGS(RestoreOptions, RestoreOption) - ///@brief When a widget is added we need to figure out what's a decent size for it - ///This enum specifies the different ways to calculate it - enum class DefaultSizeMode { - ItemSize, ///< Simply uses the Item::size() of the item being added. Actual used size might be smaller if our window isn't big enough. - Fair, ///< Gives an equal relative size as the items that are already in the layout - FairButFloor, ///< Equal to fair, but if the item is smaller than the fair suggestion, then that small size is used. - SizePolicy, ///< Uses the item's sizeHint() and sizePolicy() - }; - enum class DropIndicatorType { Classic, ///< The default Segmented, ///< Segmented indicators diff --git a/src/private/DropArea.cpp b/src/private/DropArea.cpp index 15eadd79..34615d82 100644 --- a/src/private/DropArea.cpp +++ b/src/private/DropArea.cpp @@ -136,9 +136,9 @@ void DropArea::addDockWidget(DockWidgetBase *dw, Location location, DockWidgetBa } if (option & AddingOption_StartHidden) { - addWidget(dw, location, relativeToFrame, DefaultSizeMode::Fair, option); + addWidget(dw, location, relativeToFrame, Layouting::Item::DefaultSizeMode::Fair, option); } else { - addWidget(frame, location, relativeToFrame, DefaultSizeMode::Fair, option); + addWidget(frame, location, relativeToFrame, Layouting::Item::DefaultSizeMode::Fair, option); } if (hadSingleFloatingFrame && !hasSingleFloatingFrame()) { @@ -319,13 +319,14 @@ bool DropArea::drop(QWidgetOrQuick *droppedWindow, KDDockWidgets::Location locat auto frame = Config::self().frameworkWidgetFactory()->createFrame(); frame->addWidget(dock); - addWidget(frame, location, relativeTo, DefaultSizeMode::FairButFloor); + addWidget(frame, location, relativeTo, Layouting::Item::DefaultSizeMode::FairButFloor); } else if (auto floatingWindow = qobject_cast(droppedWindow)) { if (!validateAffinity(floatingWindow)) return false; const bool hadSingleFloatingFrame = hasSingleFloatingFrame(); - addMultiSplitter(floatingWindow->dropArea(), location, relativeTo, DefaultSizeMode::FairButFloor); + addMultiSplitter(floatingWindow->dropArea(), location, relativeTo, + Layouting::Item::DefaultSizeMode::FairButFloor); if (hadSingleFloatingFrame != hasSingleFloatingFrame()) updateFloatingActions(); diff --git a/src/private/MultiSplitter.cpp b/src/private/MultiSplitter.cpp index 8472d455..95bc0ec4 100644 --- a/src/private/MultiSplitter.cpp +++ b/src/private/MultiSplitter.cpp @@ -160,8 +160,9 @@ bool MultiSplitter::validateInputs(QWidgetOrQuick *widget, } void MultiSplitter::addWidget(QWidgetOrQuick *w, Location location, - Frame *relativeToWidget, DefaultSizeMode defaultSizeMode, - AddingOption option) + Frame *relativeToWidget, + Layouting::Item::DefaultSizeMode defaultSizeMode, + AddingOption option) { auto frame = qobject_cast(w); qCDebug(addwidget) << Q_FUNC_INFO << w @@ -226,7 +227,8 @@ void MultiSplitter::addWidget(QWidgetOrQuick *w, Location location, } void MultiSplitter::addMultiSplitter(MultiSplitter *sourceMultiSplitter, Location location, - Frame *relativeTo, DefaultSizeMode defaultSizeMode) + Frame *relativeTo, + Layouting::Item::DefaultSizeMode defaultSizeMode) { qCDebug(addwidget) << Q_FUNC_INFO << sourceMultiSplitter << location << relativeTo; addWidget(sourceMultiSplitter, location, relativeTo, defaultSizeMode); diff --git a/src/private/MultiSplitter_p.h b/src/private/MultiSplitter_p.h index ebcea600..302e659b 100644 --- a/src/private/MultiSplitter_p.h +++ b/src/private/MultiSplitter_p.h @@ -69,7 +69,9 @@ public: * @brief Adds a widget to this MultiSplitter. */ void addWidget(QWidgetOrQuick *widget, KDDockWidgets::Location location, - Frame *relativeTo = nullptr, DefaultSizeMode = DefaultSizeMode::Fair, AddingOption option = {}); + Frame *relativeTo = nullptr, + Layouting::Item::DefaultSizeMode = Layouting::Item::DefaultSizeMode::Fair, + AddingOption option = {}); /** * Adds an entire MultiSplitter into this layout. The donor MultiSplitter will be deleted @@ -78,7 +80,8 @@ public: * of widgetBar when the whole splitter is dropped into this one. */ void addMultiSplitter(MultiSplitter *splitter, KDDockWidgets::Location location, - Frame *relativeTo = nullptr, DefaultSizeMode = DefaultSizeMode::Fair); + Frame *relativeTo = nullptr, + Layouting::Item::DefaultSizeMode = Layouting::Item::DefaultSizeMode::Fair); /** * @brief Removes an item from this MultiSplitter.