From 3f732e91a738344892e9eaa0b526a86c720b5f74 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Tue, 25 Feb 2020 22:53:28 +0000 Subject: [PATCH] Minor refactoring --- src/private/DebugWindow.cpp | 6 ++---- src/private/multisplitter/MultiSplitterLayout.cpp | 9 ++++++++- src/private/multisplitter/MultiSplitterLayout_p.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/private/DebugWindow.cpp b/src/private/DebugWindow.cpp index 3e188d4f..694f636a 100644 --- a/src/private/DebugWindow.cpp +++ b/src/private/DebugWindow.cpp @@ -246,10 +246,8 @@ DebugWindow::DebugWindow(QWidget *parent) layout->addWidget(button); connect(button, &QPushButton::clicked, this, [] { const auto layouts = DockRegistry::self()->layouts(); - for (auto l : layouts) { - l->redistributeSpace_recursive(l->m_leftAnchor, 0); - l->redistributeSpace_recursive(l->m_topAnchor, 0); - } + for (auto l : layouts) + l->redistributeSpace(); }); button = new QPushButton(this); diff --git a/src/private/multisplitter/MultiSplitterLayout.cpp b/src/private/multisplitter/MultiSplitterLayout.cpp index 09f37a7e..dea9fc74 100644 --- a/src/private/multisplitter/MultiSplitterLayout.cpp +++ b/src/private/multisplitter/MultiSplitterLayout.cpp @@ -1024,7 +1024,8 @@ void MultiSplitterLayout::dumpDebug() const { Q_EMIT aboutToDumpDebug(); qDebug() << Q_FUNC_INFO << "m_size=" << m_size - << "; minimumSize=" << minimumSize(); + << "; minimumSize=" << minimumSize() + << "; parentWidget=" << multiSplitter()->size(); qDebug() << "Items:"; for (auto item : items()) { @@ -1075,6 +1076,12 @@ void MultiSplitterLayout::positionStaticAnchors() m_rightAnchor->setPosition(width() - m_rightAnchor->thickness()); } +void MultiSplitterLayout::redistributeSpace() +{ + redistributeSpace_recursive(m_leftAnchor, 0); + redistributeSpace_recursive(m_topAnchor, 0); +} + void MultiSplitterLayout::redistributeSpace(QSize oldSize, QSize newSize) { positionStaticAnchors(); diff --git a/src/private/multisplitter/MultiSplitterLayout_p.h b/src/private/multisplitter/MultiSplitterLayout_p.h index 29dac09d..fca4b90c 100644 --- a/src/private/multisplitter/MultiSplitterLayout_p.h +++ b/src/private/multisplitter/MultiSplitterLayout_p.h @@ -550,6 +550,7 @@ private: * When this MultiSplitter is resized, it gives or steals the less/extra space evenly through * all widgets. **/ + void redistributeSpace(); void redistributeSpace(QSize oldSize, QSize newSize); void redistributeSpace_recursive(Anchor *fromAnchor, int minAnchorPos);