yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Notify Qt about activated/deactivated windows

Browse source 
Currently, internal windows are not marked as active. This breaks focus
logic in QtQuick.
This commit is contained in:
Vlad Zahorodnii 2021-07-15 12:08:19 +03:00
parent a3e192837b
commit 73bfe648ef
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/input.cpp
View file

@ -53,6 +53,7 @@
#include <KScreenLocker/KsldApp>
// Qt
#include <QKeyEvent>
#include <qpa/qwindowsysteminterface.h>
#include <xkbcommon/xkbcommon.h>
@ -964,14 +965,9 @@ class InternalWindowEventFilter : public InputEventFilter {
return e.isAccepted();
}
bool keyEvent(QKeyEvent *event) override {
const QList<InternalClient *> &internalClients = workspace()->internalClients();
if (internalClients.isEmpty()) {
return false;
}
const QList<InternalClient *> &clients = workspace()->internalClients();
QWindow *found = nullptr;
auto it = internalClients.end();
do {
it--;
for (auto it = clients.crbegin(); it != clients.crend(); ++it) {
if (QWindow *w = (*it)->internalWindow()) {
if (!w->isVisible()) {
continue;
@ -991,7 +987,11 @@ class InternalWindowEventFilter : public InputEventFilter {
found = w;
break;
}
} while (it != internalClients.begin());
}
if (m_lastFocus != found) {
m_lastFocus = found;
QWindowSystemInterface::handleWindowActivated(found);
}
if (!found) {
return false;
}
@ -1096,6 +1096,7 @@ private:
QSet<qint32> m_pressedIds;
QPointF m_lastGlobalTouchPos;
QPointF m_lastLocalTouchPos;
QPointer<QWindow> m_lastFocus;
};
class DecorationEventFilter : public InputEventFilter {