1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "client: implement QWaylandScreen::topLevelAt()"

Browse Source 
This reverts commit 682f7c4b78ce130d621d70b770062d76cd13fa2a.

QtWidgets depends on the old QApplication::topLevelAt() behavior too much, especially for the single top level window case. It's not easy to be decoupled in this way.

Task-number: QTBUG-113404
Fixes: QTBUG-125878
Fixes: QTBUG-126313
Pick-to: 6.8 6.7 6.5
Change-Id: I5804d9c600c77e85f4f83753c87815fbbbc2362e
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Liang Qi 2024-06-28 11:37:25 +02:00
parent 803f160dc3
commit 4ad1c345a0
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/wayland/qwaylandscreen.cpp
View File

@ -170,16 +170,6 @@ QList<QPlatformScreen *> QWaylandScreen::virtualSiblings() const
return list; return list;
} }
QWindow *QWaylandScreen::topLevelAt(const QPoint & pos) const
{
if (QWaylandWindow::fixedToplevelPositions) {
Q_UNUSED(pos);
return nullptr;
}
return QPlatformScreen::topLevelAt(pos);
}
Qt::ScreenOrientation QWaylandScreen::orientation() const Qt::ScreenOrientation QWaylandScreen::orientation() const
{ {
return m_orientation; return m_orientation;

2
src/plugins/platforms/wayland/qwaylandscreen_p.h
View File

@ -63,8 +63,6 @@ public:
QDpi logicalDpi() const override; QDpi logicalDpi() const override;
QList<QPlatformScreen *> virtualSiblings() const override; QList<QPlatformScreen *> virtualSiblings() const override;
QWindow *topLevelAt(const QPoint &point) const override;
Qt::ScreenOrientation orientation() const override; Qt::ScreenOrientation orientation() const override;
int scale() const; int scale() const;
qreal devicePixelRatio() const override; qreal devicePixelRatio() const override;