mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-21 20:45:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4786 from nextcloud/bugfix/activity-list-itemdelegate

Browse source 
Simplify activity list delegates by making them ItemDelegates, clean up
This commit is contained in:
Claudio Cambra 2022-09-07 18:20:33 +02:00 committed by GitHub
commit 7ac1bdff14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/tray/ActivityItem.qml
View file

@ -5,7 +5,7 @@ import QtQuick.Layouts 1.15
import Style 1.0
import com.nextcloud.desktopclient 1.0
MouseArea {
ItemDelegate {
id: root
property Flickable flickable
@ -21,37 +21,27 @@ MouseArea {
: Qt.darker(UserModel.currentUser.headerColor, 1.5)
enabled: (model.path !== "" || model.link !== "" || model.isCurrentUserFileActivity === true)
hoverEnabled: true
// We center the children vertically in the middle of this MouseArea to create the padding.
height: contentLayout.implicitHeight + (Style.standardSpacing * 2)
padding: Style.standardSpacing
Accessible.role: Accessible.ListItem
Accessible.name: (model.path !== "" && model.displayPath !== "") ? qsTr("Open %1 locally").arg(model.displayPath) : model.message
Accessible.onPressAction: root.clicked()
function toggleReplyOptions() {
isTalkReplyOptionVisible = !isTalkReplyOptionVisible
}
Rectangle {
id: activityHover
anchors.fill: parent
color: (parent.containsMouse ? Style.lightHover : "transparent")
background: Rectangle {
color: root.hovered ? Style.lightHover : "transparent"
}
NCToolTip {
visible: root.containsMouse && !activityContent.childHovered && model.displayLocation !== ""
visible: root.hovered && !activityContent.childHovered && model.displayLocation !== ""
text: qsTr("In %1").arg(model.displayLocation)
}
ColumnLayout {
contentItem: ColumnLayout {
id: contentLayout
anchors.left: root.left
anchors.right: root.right
anchors.rightMargin: Style.standardSpacing
anchors.leftMargin: Style.standardSpacing
anchors.verticalCenter: parent.verticalCenter
spacing: Style.activityContentSpace
@ -111,7 +101,7 @@ MouseArea {
adjustedHeaderColor: root.adjustedHeaderColor
onTriggerAction: activityModel.slotTriggerAction(model.index, actionIndex)
onShowReplyField: root.toggleReplyOptions()
onShowReplyField: root.isTalkReplyOptionVisible = true
}
}
}