effects: Drop WindowHeap.windowClicked signal

Put a TapHandler in WindowHeapDelegate instead.

src/effects/desktopgrid/qml/DesktopView.qml

@@ -131,19 +131,24 @@ FocusScope {
             windowHeap: heap
             closeButtonVisible: false
             windowTitleVisible: false
-        }
-        onActivated: effect.deactivate(effect.animationDuration);
-        onWindowClicked: {
-            if (eventPoint.event.button === Qt.MiddleButton) {
-                window.closeWindow();
-            } else if (eventPoint.event.button === Qt.RightButton) {
-                if (window.desktops.length > 0) {
-                    window.desktops = [];
-                } else {
-                    window.desktops = [desktopView.desktop];
+
+            TapHandler {
+                acceptedPointerTypes: PointerDevice.GenericPointer | PointerDevice.Pen
+                acceptedButtons: Qt.MiddleButton | Qt.RightButton
+                onTapped: {
+                    if (eventPoint.event.button === Qt.MiddleButton) {
+                        window.closeWindow();
+                    } else if (eventPoint.event.button === Qt.RightButton) {
+                        if (window.desktops.length > 0) {
+                            window.desktops = [];
+                        } else {
+                            window.desktops = [desktopView.desktop];
+                        }
+                    }
                 }
             }
         }
+        onActivated: effect.deactivate(effect.animationDuration);
         Behavior on x {
             enabled: !dragHandler.active
             NumberAnimation {

src/effects/overview/qml/ScreenView.qml

@@ -268,13 +268,14 @@ FocusScope {
 
                     opacity: 1 - downGestureProgress
                     onDownGestureTriggered: window.closeWindow()
-                }
-                onActivated: effect.deactivate();
-                onWindowClicked: {
-                    if (eventPoint.event.button === Qt.MiddleButton) {
-                        window.closeWindow();
+
+                    TapHandler {
+                        acceptedPointerTypes: PointerDevice.GenericPointer | PointerDevice.Pen
+                        acceptedButtons: Qt.MiddleButton
+                        onTapped: window.closeWindow()
                     }
                 }
+                onActivated: effect.deactivate();
             }
 
             Milou.ResultsView {

src/effects/private/qml/WindowHeap.qml

@@ -51,8 +51,6 @@ FocusScope {
     property bool dragActive: false
 
     signal activated()
-    //TODO: for 5.26 the delegate will be a separate component instead
-    signal windowClicked(QtObject window, EventPoint eventPoint)
 
     function activateIndex(index) {
         KWinComponents.Workspace.activeClient = windowsInstantiator.objectAt(index).window;

src/effects/private/qml/WindowHeapDelegate.qml

@@ -371,14 +371,6 @@ Item {
         }
     }
 
-    TapHandler {
-        acceptedPointerTypes: PointerDevice.GenericPointer | PointerDevice.Pen
-        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-        onTapped: {
-            thumb.windowHeap.windowClicked(thumb.window, eventPoint)
-        }
-    }
-
     component DragManager : DragHandler {
         target: null
         dragThreshold: 0

src/effects/windowview/qml/main.qml

@@ -179,12 +179,6 @@ Item {
                 }
             }
             layout.mode: effect.layout
-            onWindowClicked: {
-                if (eventPoint.event.button !== Qt.MiddleButton) {
-                    return;
-                }
-                window.closeWindow();
-            }
             model: KWinComponents.WindowFilterModel {
                 activity: KWinComponents.Workspace.currentActivity
                 desktop: {
@@ -209,6 +203,12 @@ Item {
                 windowHeap: heap
                 opacity: 1 - downGestureProgress
                 onDownGestureTriggered: window.closeWindow()
+
+                TapHandler {
+                    acceptedPointerTypes: PointerDevice.GenericPointer | PointerDevice.Pen
+                    acceptedButtons: Qt.MiddleButton
+                    onTapped: window.closeWindow();
+                }
             }
             onActivated: effect.deactivate(container.effect.animationDuration);
         }