From e89177b25bdee14f56aa14ee2e3e900e677df775 Mon Sep 17 00:00:00 2001
From: Camila <hello@camila.codes>
Date: Mon, 27 Jul 2020 17:27:23 +0200
Subject: [PATCH] Add OpacityMask to fix mouse hover on round corner.

- Fix for #2173.
- Removed the workaround for the left round corner which was also
fixed with the OpacityMask.

Signed-off-by: Camila <hello@camila.codes>
---
 src/gui/tray/Window.qml | 62 +++++++++++------------------------------
 1 file changed, 16 insertions(+), 46 deletions(-)

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 1efb8212b..c6be85c22 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -75,6 +75,19 @@ Window {
         }
     }
 
+    OpacityMask {
+        anchors.fill: parent
+        source: ShaderEffectSource {
+            sourceItem: trayWindowBackground
+            hideSource: true
+        }
+        maskSource: Rectangle {
+            width: trayWindowBackground.width
+            height: trayWindowBackground.height
+            radius: trayWindowBackground.radius
+        }
+    }
+
     Rectangle {
         id: trayWindowBackground
 
@@ -90,7 +103,6 @@ Window {
             anchors.top:    trayWindowBackground.top
             height:         Style.trayWindowHeaderHeight
             width:          Style.trayWindowWidth
-            radius:         (Style.trayWindowRadius > 0) ? (Style.trayWindowRadius - 1) : 0
             color:          Style.ncBlue
 
             // The overlay rectangle below eliminates the rounded corners from the bottom of the header
@@ -271,51 +283,9 @@ Window {
                         }
                     }
 
-                    background:
-                        Item {
-                        id: leftHoverContainer
-
-                        height: Style.trayWindowHeaderHeight
-                        width:  Style.currentAccountButtonWidth
-                        Rectangle {
-                            width: Style.currentAccountButtonWidth / 2
-                            height: Style.trayWindowHeaderHeight / 2
-                            color: "transparent"
-                            clip: true
-                            Rectangle {
-                                width: Style.currentAccountButtonWidth
-                                height: Style.trayWindowHeaderHeight
-                                radius: Style.trayWindowRadius
-                                color: "white"
-                                opacity: 0.2
-                                visible: accountBtnMouseArea.containsMouse
-                            }
-                        }
-                        Rectangle {
-                            width: Style.currentAccountButtonWidth / 2
-                            height: Style.trayWindowHeaderHeight / 2
-                            anchors.bottom: leftHoverContainer.bottom
-                            color: "white"
-                            opacity: 0.2
-                            visible: accountBtnMouseArea.containsMouse
-                        }
-                        Rectangle {
-                            width: Style.currentAccountButtonWidth / 2
-                            height: Style.trayWindowHeaderHeight / 2
-                            anchors.right: leftHoverContainer.right
-                            color: "white"
-                            opacity: 0.2
-                            visible: accountBtnMouseArea.containsMouse
-                        }
-                        Rectangle {
-                            width: Style.currentAccountButtonWidth / 2
-                            height: Style.trayWindowHeaderHeight / 2
-                            anchors.right: leftHoverContainer.right
-                            anchors.bottom: leftHoverContainer.bottom
-                            color: "white"
-                            opacity: 0.2
-                            visible: accountBtnMouseArea.containsMouse
-                        }
+                    background: Rectangle {
+                        color: accountBtnMouseArea.containsMouse ? "white" : "transparent"
+                        opacity: 0.2
                     }
 
                     RowLayout {
-- 
2.30.2