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

xcb: Reflect geometry of foreign window on creation

Browse Source 
Change-Id: I305b256696a32454f64c12c5a8901b65506fc520
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 4e2e3a6b4fe0ff5e1930707808f02e3be9343312)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2023-08-15 21:17:53 +02:00 committed by Qt Cherry-pick Bot
parent f6720887e6
commit 18678e3fc7
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -472,6 +472,18 @@ QXcbWindow::~QXcbWindow()
destroy(); destroy();
} }
QXcbForeignWindow::QXcbForeignWindow(QWindow *window, WId nativeHandle)
: QXcbWindow(window)
{
m_window = nativeHandle;
// Reflect the foreign window's geometry as our own
if (auto geometry = Q_XCB_REPLY(xcb_get_geometry, xcb_connection(), m_window)) {
QRect nativeGeometry(geometry->x, geometry->y, geometry->width, geometry->height);
QPlatformWindow::setGeometry(nativeGeometry);
}
}
QXcbForeignWindow::~QXcbForeignWindow() QXcbForeignWindow::~QXcbForeignWindow()
{ {
// Clear window so that destroy() does not affect it // Clear window so that destroy() does not affect it

3
src/plugins/platforms/xcb/qxcbwindow.h
View File

@ -258,8 +258,7 @@ protected:
class QXcbForeignWindow : public QXcbWindow class QXcbForeignWindow : public QXcbWindow
{ {
public: public:
QXcbForeignWindow(QWindow *window, WId nativeHandle) QXcbForeignWindow(QWindow *window, WId nativeHandle);
: QXcbWindow(window) { m_window = nativeHandle; }
~QXcbForeignWindow(); ~QXcbForeignWindow();
bool isForeignWindow() const override { return true; } bool isForeignWindow() const override { return true; }

2
tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp
View File

@ -67,8 +67,6 @@ void tst_ForeignWindow::initialState()
// For extra bonus points, the foreign window should actually // For extra bonus points, the foreign window should actually
// reflect the state of the native window. // reflect the state of the native window.
if (!QGuiApplication::platformName().compare(QLatin1String("xcb"), Qt::CaseInsensitive))
QEXPECT_FAIL("", "QXcbWindow does not pick up foreign window geometry", Continue);
QCOMPARE(foreignWindow->geometry(), initialGeometry); QCOMPARE(foreignWindow->geometry(), initialGeometry);
} }