From 6267d597311ccea26a8e70d57bd730ad13d146c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= Date: Tue, 20 Jun 2017 21:37:56 +0200 Subject: [PATCH] Properly block the edge also for touch screen edges Summary: There was a regression introduced with bug fix eec6afe6 which added a for pointer events only check also to doUpdateBlocking. Do to that the edge blocking mechanism didn't work for touch edges. BUG: 380476 FIXED-IN: 5.10.3 Test Plan: verified with xwininfo that there is no longer a window when in full screen. Activated edges through touch and pointer Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6304 --- plugins/platforms/x11/standalone/edge.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/platforms/x11/standalone/edge.cpp b/plugins/platforms/x11/standalone/edge.cpp index cb77854e45..f4331fabc5 100644 --- a/plugins/platforms/x11/standalone/edge.cpp +++ b/plugins/platforms/x11/standalone/edge.cpp @@ -130,9 +130,6 @@ void WindowBasedEdge::doUpdateBlocking() if (!isReserved()) { return; } - if (!activatesForPointer()) { - return; - } if (isBlocked()) { m_window.unmap(); m_approachWindow.unmap();