diff --git a/src/View.h b/src/View.h index 0c0f7b42..ca67c406 100644 --- a/src/View.h +++ b/src/View.h @@ -138,10 +138,10 @@ public: virtual void raiseAndActivate() = 0; virtual void raise() = 0; virtual void activateWindow() = 0; - virtual bool isTopLevel() const = 0; + virtual bool isRootView() const = 0; bool isWindow() const { - return isTopLevel(); + return isRootView(); }; virtual QPoint mapToGlobal(QPoint) const = 0; virtual QPoint mapFromGlobal(QPoint) const = 0; diff --git a/src/controllers/DockWidget.cpp b/src/controllers/DockWidget.cpp index b0f72d83..26fecbb6 100644 --- a/src/controllers/DockWidget.cpp +++ b/src/controllers/DockWidget.cpp @@ -182,7 +182,7 @@ std::shared_ptr DockWidget::guestView() const bool DockWidget::isFloating() const { - if (view()->isTopLevel()) + if (view()->isRootView()) return true; auto fw = floatingWindow(); @@ -394,7 +394,7 @@ QStringList DockWidget::affinities() const void DockWidget::show() { - if (view()->isTopLevel() && (d->m_lastPosition->wasFloating() || !d->m_lastPosition->isValid())) { + if (view()->isRootView() && (d->m_lastPosition->wasFloating() || !d->m_lastPosition->isValid())) { // Create the FloatingWindow already, instead of waiting for the show event. // This reduces flickering on some platforms d->morphIntoFloatingWindow(); diff --git a/src/private/WidgetResizeHandler.cpp b/src/private/WidgetResizeHandler.cpp index 20e07238..5bf5ef80 100644 --- a/src/private/WidgetResizeHandler.cpp +++ b/src/private/WidgetResizeHandler.cpp @@ -179,7 +179,7 @@ bool WidgetResizeHandler::mouseMoveEvent(QMouseEvent *e) QRect newGeometry = oldGeometry; QRect parentGeometry; - if (!mTarget->isTopLevel()) { + if (!mTarget->isRootView()) { auto parent = mTarget->parentView(); parentGeometry = KDDockWidgets::globalGeometry(parent.get()); } @@ -264,7 +264,7 @@ bool WidgetResizeHandler::mouseMoveEvent(QMouseEvent *e) return true; } - if (!mTarget->isTopLevel()) { + if (!mTarget->isRootView()) { // Clip to parent's geometry. newGeometry = newGeometry.intersected(parentGeometry); diff --git a/src/qtquick/views/ViewWrapper_qtquick.cpp b/src/qtquick/views/ViewWrapper_qtquick.cpp index 626f929a..9b126f26 100644 --- a/src/qtquick/views/ViewWrapper_qtquick.cpp +++ b/src/qtquick/views/ViewWrapper_qtquick.cpp @@ -74,7 +74,7 @@ std::shared_ptr ViewWrapper_qtquick::windowHandle() const return {}; } -bool ViewWrapper_qtquick::isTopLevel() const +bool ViewWrapper_qtquick::isRootView() const { return {}; } diff --git a/src/qtquick/views/ViewWrapper_qtquick.h b/src/qtquick/views/ViewWrapper_qtquick.h index 61c8ef65..01127fab 100644 --- a/src/qtquick/views/ViewWrapper_qtquick.h +++ b/src/qtquick/views/ViewWrapper_qtquick.h @@ -34,7 +34,7 @@ public: void move(QPoint) override; QPoint mapToGlobal(QPoint) const override; QPoint mapFromGlobal(QPoint) const override; - bool isTopLevel() const override; + bool isRootView() const override; bool isVisible() const override; void setVisible(bool) override; void activateWindow() override; diff --git a/src/qtquick/views/View_qtquick.h b/src/qtquick/views/View_qtquick.h index bec0d5c9..a5203ae5 100644 --- a/src/qtquick/views/View_qtquick.h +++ b/src/qtquick/views/View_qtquick.h @@ -180,7 +180,7 @@ public: return {}; } - bool isTopLevel() const override + bool isRootView() const override { return {}; } diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp index dbe5e1c8..675b756d 100644 --- a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp +++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp @@ -145,7 +145,7 @@ std::shared_ptr ViewWrapper_qtwidgets::windowHandle() const return nullptr; } -bool ViewWrapper_qtwidgets::isTopLevel() const +bool ViewWrapper_qtwidgets::isRootView() const { return m_widget->isTopLevel(); } diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.h b/src/qtwidgets/views/ViewWrapper_qtwidgets.h index 190f6754..14fe4544 100644 --- a/src/qtwidgets/views/ViewWrapper_qtwidgets.h +++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.h @@ -34,7 +34,7 @@ public: void move(QPoint) override; QPoint mapToGlobal(QPoint) const override; QPoint mapFromGlobal(QPoint) const override; - bool isTopLevel() const override; + bool isRootView() const override; bool isVisible() const override; void setVisible(bool) override; void activateWindow() override; diff --git a/src/qtwidgets/views/View_qtwidgets.h b/src/qtwidgets/views/View_qtwidgets.h index bb374cc7..05e3d966 100644 --- a/src/qtwidgets/views/View_qtwidgets.h +++ b/src/qtwidgets/views/View_qtwidgets.h @@ -220,9 +220,9 @@ public: Base::window()->raise(); } - bool isTopLevel() const override + bool isRootView() const override { - return QWidget::isTopLevel(); + return QWidget::isWindow(); } QPoint mapToGlobal(QPoint localPt) const override diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index f801986a..696bc7d8 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -164,7 +164,7 @@ void TestDocks::tst_restoreSimple() auto fw2 = dock2->floatingWindow(); QVERIFY(fw2); QVERIFY(fw2->isVisible()); - QVERIFY(fw2->view()->isTopLevel()); + QVERIFY(fw2->view()->isRootView()); QCOMPARE(fw2->pos(), dock2FloatingPoint); QVERIFY(m->view()->windowHandle()->equals(fw2->view()->windowHandle()->transientParent())); QVERIFY(dock2->isFloating());