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

Follow up handleWindowActivated -> handleFocusWindowChanged rename

Browse Source 
Change-Id: I75eeae6dfa4af8a17dffaef74f15fc87a58bcf61
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
This commit is contained in:
Tor Arne Vestbø 2023-11-21 18:29:42 +01:00
parent 16ba2fad85
commit 856b4352e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -958,7 +958,7 @@ void QWaylandDisplay::handleWaylandSync()
// handleWindowActivated() calls immediately. // handleWindowActivated() calls immediately.
QWindow *activeWindow = mActiveWindows.empty() ? nullptr : mActiveWindows.last()->window(); QWindow *activeWindow = mActiveWindows.empty() ? nullptr : mActiveWindows.last()->window();
if (activeWindow != QGuiApplication::focusWindow()) if (activeWindow != QGuiApplication::focusWindow())
QWindowSystemInterface::handleWindowActivated(activeWindow); QWindowSystemInterface::handleFocusWindowChanged(activeWindow);
if (!activeWindow) { if (!activeWindow) {
if (lastInputDevice()) { if (lastInputDevice()) {

2
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -110,7 +110,7 @@ bool QWaylandInputDevice::Keyboard::createDefaultKeymap()
QWaylandInputDevice::Keyboard::~Keyboard() QWaylandInputDevice::Keyboard::~Keyboard()
{ {
if (mFocus) if (mFocus)
QWindowSystemInterface::handleWindowActivated(nullptr); QWindowSystemInterface::handleFocusWindowChanged(nullptr);
if (version() >= 3) if (version() >= 3)
wl_keyboard_release(object()); wl_keyboard_release(object());
else else