diff --git a/src/controllers/Layout.cpp b/src/controllers/Layout.cpp index 04ab2990..443786bd 100644 --- a/src/controllers/Layout.cpp +++ b/src/controllers/Layout.cpp @@ -33,6 +33,8 @@ Layout::Layout(Type type, View *view) view->layoutInvalidated.connect([this] { updateSizeConstraints(); }); + + view->resized.connect(&Layout::onResize, this); } Layout::~Layout() diff --git a/src/controllers/Layout.h b/src/controllers/Layout.h index eae19147..654c68f2 100644 --- a/src/controllers/Layout.h +++ b/src/controllers/Layout.h @@ -199,10 +199,6 @@ public: /// @brief Emitted when the count of visible widgets changes KDBindings::Signal visibleWidgetCountChanged; - /// TODOm3: Better a signal, so that derived classes don't have to remember to call these - bool onResize(QSize newSize); - - /// TODOm3: Remove void viewAboutToBeDeleted(); Layouting::ItemContainer *rootItem() const; @@ -234,6 +230,7 @@ protected: QList framesFrom(View *frameOrMultiSplitter) const; private: + bool onResize(QSize newSize); bool m_inResizeEvent = false; Layouting::ItemContainer *m_rootItem = nullptr; KDBindings::ConnectionHandle m_minSizeChangedHandler; diff --git a/src/qtquick/views/DropArea_qtquick.cpp b/src/qtquick/views/DropArea_qtquick.cpp index ef361d13..26b40407 100644 --- a/src/qtquick/views/DropArea_qtquick.cpp +++ b/src/qtquick/views/DropArea_qtquick.cpp @@ -31,8 +31,3 @@ DropArea_qtquick::~DropArea_qtquick() if (!freed()) m_dropArea->viewAboutToBeDeleted(); } - -bool DropArea_qtquick::onResize(QSize newSize) -{ - return m_dropArea->onResize(newSize); -} diff --git a/src/qtquick/views/DropArea_qtquick.h b/src/qtquick/views/DropArea_qtquick.h index 1756e33c..b12735f2 100644 --- a/src/qtquick/views/DropArea_qtquick.h +++ b/src/qtquick/views/DropArea_qtquick.h @@ -28,9 +28,6 @@ public: explicit DropArea_qtquick(Controllers::DropArea *, View *parent); ~DropArea_qtquick(); - /// TODOm3 - bool onResize(QSize newSize) override; - private: Controllers::DropArea *const m_dropArea; }; diff --git a/src/qtquick/views/MDILayout_qtquick.cpp b/src/qtquick/views/MDILayout_qtquick.cpp index a6c4d899..66c41560 100644 --- a/src/qtquick/views/MDILayout_qtquick.cpp +++ b/src/qtquick/views/MDILayout_qtquick.cpp @@ -27,8 +27,3 @@ MDILayout_qtquick::~MDILayout_qtquick() if (!freed()) m_controller->viewAboutToBeDeleted(); } - -bool MDILayout_qtquick::onResize(QSize newSize) -{ - return m_controller->onResize(newSize); -} diff --git a/src/qtquick/views/MDILayout_qtquick.h b/src/qtquick/views/MDILayout_qtquick.h index 47c9289f..10f24875 100644 --- a/src/qtquick/views/MDILayout_qtquick.h +++ b/src/qtquick/views/MDILayout_qtquick.h @@ -28,9 +28,6 @@ public: explicit MDILayout_qtquick(Controllers::MDILayout *controller, View *parent); ~MDILayout_qtquick(); - /// TODOm3 - bool onResize(QSize newSize) override; - private: Controllers::MDILayout *const m_controller; }; diff --git a/src/qtwidgets/views/DropArea_qtwidgets.cpp b/src/qtwidgets/views/DropArea_qtwidgets.cpp index 62132a07..a081237e 100644 --- a/src/qtwidgets/views/DropArea_qtwidgets.cpp +++ b/src/qtwidgets/views/DropArea_qtwidgets.cpp @@ -31,8 +31,3 @@ DropArea_qtwidgets::~DropArea_qtwidgets() if (!freed()) m_dropArea->viewAboutToBeDeleted(); } - -bool DropArea_qtwidgets::onResize(QSize newSize) -{ - return m_dropArea->onResize(newSize); -} diff --git a/src/qtwidgets/views/DropArea_qtwidgets.h b/src/qtwidgets/views/DropArea_qtwidgets.h index d6d8a587..818f93bb 100644 --- a/src/qtwidgets/views/DropArea_qtwidgets.h +++ b/src/qtwidgets/views/DropArea_qtwidgets.h @@ -38,9 +38,6 @@ public: explicit DropArea_qtwidgets(Controllers::DropArea *, View *parent); ~DropArea_qtwidgets(); - /// TODOm3 - bool onResize(QSize newSize) override; - private: Controllers::DropArea *const m_dropArea; }; diff --git a/src/qtwidgets/views/MDILayout_qtwidgets.cpp b/src/qtwidgets/views/MDILayout_qtwidgets.cpp index a19862ef..c4366445 100644 --- a/src/qtwidgets/views/MDILayout_qtwidgets.cpp +++ b/src/qtwidgets/views/MDILayout_qtwidgets.cpp @@ -27,8 +27,3 @@ MDILayout_qtwidgets::~MDILayout_qtwidgets() if (!freed()) m_controller->viewAboutToBeDeleted(); } - -bool MDILayout_qtwidgets::onResize(QSize newSize) -{ - return m_controller->onResize(newSize); -} diff --git a/src/qtwidgets/views/MDILayout_qtwidgets.h b/src/qtwidgets/views/MDILayout_qtwidgets.h index e2263ffb..4e107573 100644 --- a/src/qtwidgets/views/MDILayout_qtwidgets.h +++ b/src/qtwidgets/views/MDILayout_qtwidgets.h @@ -29,9 +29,6 @@ public: explicit MDILayout_qtwidgets(Controllers::MDILayout *controller, View *parent); ~MDILayout_qtwidgets(); - /// TODOm3 - bool onResize(QSize newSize) override; - private: Controllers::MDILayout *const m_controller; };