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

Rename LayoutSaver::MultiSplitterLayout to LayoutSaver::MultiSplitter

Browse Source
This commit is contained in:
Sergio Martins
2020-06-11 16:46:53 +01:00
parent 163b194398
commit 6bbcb8f8f2
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/LayoutSaver.cpp
View File

@@ -731,7 +731,7 @@ void LayoutSaver::MainWindow::fromVariantMap(const QVariantMap &map)
} }
bool LayoutSaver::MultiSplitterLayout::isValid() const bool LayoutSaver::MultiSplitter::isValid() const
{ {
if (layout.isEmpty()) if (layout.isEmpty())
return false; return false;
@@ -744,14 +744,14 @@ bool LayoutSaver::MultiSplitterLayout::isValid() const
return true; return true;
} }
void LayoutSaver::MultiSplitterLayout::scaleSizes(const ScalingInfo &) void LayoutSaver::MultiSplitter::scaleSizes(const ScalingInfo &)
{ {
// scalingInfo.applyFactorsTo(/*by-ref*/size); // scalingInfo.applyFactorsTo(/*by-ref*/size);
//for (LayoutSaver::Item &item : items) TODO //for (LayoutSaver::Item &item : items) TODO
// item.scaleSizes(scalingInfo); // item.scaleSizes(scalingInfo);
} }
QVariantMap LayoutSaver::MultiSplitterLayout::toVariantMap() const QVariantMap LayoutSaver::MultiSplitter::toVariantMap() const
{ {
QVariantMap result; QVariantMap result;
result.insert(QStringLiteral("layout"), layout); result.insert(QStringLiteral("layout"), layout);
@@ -764,7 +764,7 @@ QVariantMap LayoutSaver::MultiSplitterLayout::toVariantMap() const
return result; return result;
} }
void LayoutSaver::MultiSplitterLayout::fromVariantMap(const QVariantMap &map) void LayoutSaver::MultiSplitter::fromVariantMap(const QVariantMap &map)
{ {
layout = map.value(QStringLiteral("layout")).toMap(); layout = map.value(QStringLiteral("layout")).toMap();
const QVariantMap framesV = map.value(QStringLiteral("frames")).toMap(); const QVariantMap framesV = map.value(QStringLiteral("frames")).toMap();

2
src/LayoutSaver.h
View File

@@ -107,7 +107,7 @@ public:
struct FloatingWindow; struct FloatingWindow;
struct DockWidget; struct DockWidget;
struct Position; struct Position;
struct MultiSplitterLayout; struct MultiSplitter;
struct Frame; struct Frame;
struct Placeholder; struct Placeholder;
struct ScalingInfo; struct ScalingInfo;

6
src/LayoutSaver_p.h
View File

@@ -198,7 +198,7 @@ struct LayoutSaver::Frame
LayoutSaver::DockWidget::List dockWidgets; LayoutSaver::DockWidget::List dockWidgets;
}; };
struct LayoutSaver::MultiSplitterLayout struct LayoutSaver::MultiSplitter
{ {
bool isValid() const; bool isValid() const;
/// Iterates throught the layout and patches all absolute sizes. See RestoreOption_RelativeToMainWindow. /// Iterates throught the layout and patches all absolute sizes. See RestoreOption_RelativeToMainWindow.
@@ -223,7 +223,7 @@ struct LayoutSaver::FloatingWindow
QVariantMap toVariantMap() const; QVariantMap toVariantMap() const;
void fromVariantMap(const QVariantMap &map); void fromVariantMap(const QVariantMap &map);
LayoutSaver::MultiSplitterLayout multiSplitterLayout; LayoutSaver::MultiSplitter multiSplitterLayout;
QStringList affinities; QStringList affinities;
int parentIndex = -1; int parentIndex = -1;
QRect geometry; QRect geometry;
@@ -246,7 +246,7 @@ public:
void fromVariantMap(const QVariantMap &map); void fromVariantMap(const QVariantMap &map);
KDDockWidgets::MainWindowOptions options; KDDockWidgets::MainWindowOptions options;
LayoutSaver::MultiSplitterLayout multiSplitterLayout; LayoutSaver::MultiSplitter multiSplitterLayout;
QString uniqueName; QString uniqueName;
QStringList affinities; QStringList affinities;
QRect geometry; QRect geometry;

6
src/private/widgets/MultiSplitter.cpp
View File

@@ -442,7 +442,7 @@ QRect MultiSplitter::rectForDrop(const QWidgetOrQuick *widget, Location location
return container->suggestedDropRect(&item, relativeTo, Layouting::Item::Location(location)); return container->suggestedDropRect(&item, relativeTo, Layouting::Item::Location(location));
} }
bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitterLayout &l) bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitter &l)
{ {
setRootItem(new Layouting::ItemContainer(this)); setRootItem(new Layouting::ItemContainer(this));
@@ -461,9 +461,9 @@ bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitterLayout &l)
return true; return true;
} }
LayoutSaver::MultiSplitterLayout MultiSplitter::serialize() const LayoutSaver::MultiSplitter MultiSplitter::serialize() const
{ {
LayoutSaver::MultiSplitterLayout l; LayoutSaver::MultiSplitter l;
l.layout = m_rootItem->toVariantMap(); l.layout = m_rootItem->toVariantMap();
const Layouting::Item::List items = m_rootItem->items_recursive(); const Layouting::Item::List items = m_rootItem->items_recursive();
l.frames.reserve(items.size()); l.frames.reserve(items.size());

4
src/private/widgets/MultiSplitter_p.h
View File

@@ -144,8 +144,8 @@ public:
*/ */
QRect rectForDrop(const QWidgetOrQuick *widget, KDDockWidgets::Location location, const Layouting::Item *relativeTo) const; QRect rectForDrop(const QWidgetOrQuick *widget, KDDockWidgets::Location location, const Layouting::Item *relativeTo) const;
bool deserialize(const LayoutSaver::MultiSplitterLayout &); bool deserialize(const LayoutSaver::MultiSplitter &);
LayoutSaver::MultiSplitterLayout serialize() const; LayoutSaver::MultiSplitter serialize() const;
///@brief returns the list of separators ///@brief returns the list of separators
QVector<Layouting::Separator*> separators() const; QVector<Layouting::Separator*> separators() const;