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

Return wl_surface* QWaylandWindow::winId()

Browse Source 
Required when you want to use some of the wayland protocols
(For example: Keyboard shortcuts inhibit)

Fixes: QTBUG-67919
Fixes: QTBUG-93103
Fixes: QTBUG-94729
Change-Id: I112c4c3eac99187317dce8de59a77ba3b0e70d17
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Xavier BESSON 2024-07-05 12:19:09 +02:00
parent ab9d58cd42
commit 33dcb1d7ec
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -60,8 +60,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window, QWaylandDisplay *display)
mFrameCallbackTimeout = frameCallbackTimeout; mFrameCallbackTimeout = frameCallbackTimeout;
} }
static WId id = 1;
mWindowId = id++;
initializeWlSurface(); initializeWlSurface();
connect(this, &QWaylandWindow::wlSurfaceCreated, this, connect(this, &QWaylandWindow::wlSurfaceCreated, this,
@ -351,7 +349,7 @@ QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
WId QWaylandWindow::winId() const WId QWaylandWindow::winId() const
{ {
return mWindowId; return reinterpret_cast<WId>(wlSurface());
} }
void QWaylandWindow::setParent(const QPlatformWindow *parent) void QWaylandWindow::setParent(const QPlatformWindow *parent)

1
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -295,7 +295,6 @@ protected:
GestureState mGestureState = GestureNotActive; GestureState mGestureState = GestureNotActive;
#endif #endif
WId mWindowId;
bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
int mFrameCallbackCheckIntervalTimerId = -1; int mFrameCallbackCheckIntervalTimerId = -1;
QAtomicInt mWaitingForUpdateDelivery = false; QAtomicInt mWaitingForUpdateDelivery = false;