fix hover state

Author: memurats

src/gui/tray/ActivityItem.qml

@@ -7,6 +7,7 @@ import QtQml
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+
 import Style
 import com.nextcloud.desktopclient
 
@@ -24,25 +25,31 @@ ItemDelegate {
     property bool isTalkReplyOptionVisible: model.messageSent !== ""
 
     padding: Style.standardSpacing
+    hoverEnabled: true
 
     Accessible.role: Accessible.ListItem
     Accessible.name: (model.path !== "" && model.displayPath !== "") ? qsTr("Open %1 locally").arg(model.displayPath) : model.message
     Accessible.onPressAction: root.clicked()
 
+    background: Rectangle {
+        color: root.hovered || root.activeFocus ? palette.highlight : "transparent"
+        radius: Style.mediumRoundedButtonRadius
+        border.width: 0
+    }
+
     ToolTip {
         popupType: Qt.platform.os === "windows" ? Popup.Item : Popup.Native
         visible: root.hovered && !activityContent.childHovered && model.displayLocation !== ""
         text: qsTr("In %1").arg(model.displayLocation)
     }
 
-    // TODO: the current style does not support customization of this control
     contentItem: ColumnLayout {
         spacing: Style.smallSpacing
 
         ActivityItemContent {
             id: activityContent
 
-            adaptiveTextColor: root.activeFocus ? palette.highlightedText : palette.text
+            adaptiveTextColor: root.hovered || root.activeFocus ? palette.highlightedText : palette.text
 
             Layout.fillWidth: true
             Layout.minimumHeight: Style.minActivityHeight
@@ -60,6 +67,7 @@ ItemDelegate {
 
         Loader {
             id: talkReplyTextFieldLoader
+
             active: root.isChatActivity && root.isTalkReplyPossible && model.messageSent === ""
             visible: root.isTalkReplyOptionVisible
 
@@ -69,8 +77,8 @@ ItemDelegate {
 
             sourceComponent: TalkReplyTextField {
                 onSendReply: {
-                    UserModel.currentUser.sendReplyMessage(model.activityIndex, model.conversationToken, reply, model.messageId);
-                    talkReplyTextFieldLoader.visible = false;
+                    UserModel.currentUser.sendReplyMessage(model.activityIndex, model.conversationToken, reply, model.messageId)
+                    talkReplyTextFieldLoader.visible = false
                 }
             }
         }

src/gui/tray/ActivityList.qml

@@ -11,17 +11,17 @@ import com.nextcloud.desktopclient as NC
 
 ScrollView {
     id: controlRoot
+
     property alias model: sortedActivityList.sourceModel
     property alias count: activityList.count
-    property alias atYBeginning : activityList.atYBeginning
+    property alias atYBeginning: activityList.atYBeginning
     property bool isFileActivityList: false
     property int iconSize: Style.trayListItemIconSize
     property int delegateHorizontalPadding: 0
 
     property bool scrollingToTop: false
 
     function scrollToTop() {
-        // Triggers activation of repeating upward flick timer
         scrollingToTop = true
     }
 
@@ -33,7 +33,7 @@ ScrollView {
     topPadding: 0
     bottomPadding: 0
     rightPadding: ScrollBar.vertical.width
-    
+
     focus: false
 
     ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
@@ -60,6 +60,9 @@ ScrollView {
         currentIndex: -1
         interactive: true
 
+        highlight: null
+        highlightFollowsCurrentItem: false
+
         Timer {
             id: repeatUpFlickTimer
             interval: Style.activityListScrollToTopTimerInterval
@@ -74,53 +77,34 @@ ScrollView {
             }
         }
 
-        highlight: Rectangle {
-            id: activityHover
-            anchors.fill: activityList.currentItem
-            color: palette.highlight
-            radius: Style.mediumRoundedButtonRadius
-            visible: activityList.activeFocus
-        }
-
-        highlightFollowsCurrentItem: true
-        highlightMoveDuration: 0
-        highlightResizeDuration: 0
-        highlightRangeMode: ListView.ApplyRange
-        preferredHighlightBegin: 0
-        preferredHighlightEnd: controlRoot.height
-
         model: NC.SortedActivityListModel {
             id: sortedActivityList
         }
 
         delegate: ActivityItem {
-            background: null
             width: activityList.contentItem.width
 
             isFileActivityList: controlRoot.isFileActivityList
             iconSize: Style.nmcListViewIconSize
             leftPadding: Style.nmcListViewLeftPadding
             flickable: activityList
+
             onHoveredChanged: if (hovered) {
-                // When we set the currentIndex the list view will scroll...
-                // unless we tamper with the preferred highlight points to stop this.
-                const savedPreferredHighlightBegin = activityList.preferredHighlightBegin;
-                const savedPreferredHighlightEnd = activityList.preferredHighlightEnd;
-                // Set overkill values to make sure no scroll happens when we hover with mouse
-                activityList.preferredHighlightBegin = -controlRoot.height;
-                activityList.preferredHighlightEnd = controlRoot.height * 2;
+                const savedPreferredHighlightBegin = activityList.preferredHighlightBegin
+                const savedPreferredHighlightEnd = activityList.preferredHighlightEnd
 
-                activityList.currentIndex = index
+                activityList.preferredHighlightBegin = -controlRoot.height
+                activityList.preferredHighlightEnd = controlRoot.height * 2
 
-                // Reset original values so keyboard navigation makes list view scroll
-                activityList.preferredHighlightBegin = savedPreferredHighlightBegin;
-                activityList.preferredHighlightEnd = savedPreferredHighlightEnd;
+                activityList.currentIndex = index
 
-                forceActiveFocus();
+                activityList.preferredHighlightBegin = savedPreferredHighlightBegin
+                activityList.preferredHighlightEnd = savedPreferredHighlightEnd
             }
+
             onClicked: {
                 if (model.isCurrentUserFileActivity && model.openablePath) {
-                    openFile("file://" + model.openablePath);
+                    openFile("file://" + model.openablePath)
                 } else {
                     activityItemClicked(model.activityIndex)
                 }
@@ -151,6 +135,7 @@ ScrollView {
 
         Column {
             id: placeholderColumn
+
             width: parent.width * 0.75
             anchors.centerIn: parent
             visible: activityList.count === 0
@@ -165,12 +150,12 @@ ScrollView {
             }
 
             EnforcedPlainTextLabel {
-               width: parent.width
-               text: qsTr("No activities yet")
-               font.bold: true
-               wrapMode: Text.Wrap
-               horizontalAlignment: Text.AlignHCenter
-               verticalAlignment: Text.AlignVCenter
+                width: parent.width
+                text: qsTr("No activities yet")
+                font.bold: true
+                wrapMode: Text.Wrap
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
             }
         }
     }