mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 14:36:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5724 from nextcloud/bugfix/alignActivityText

Browse source 
align activity text with "Sync now" text
This commit is contained in:
Matthieu Gallien 2023-05-23 14:21:30 +02:00 committed by GitHub
commit 4b719a1c17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,7 @@ ItemDelegate {
Layout.fillWidth: true
Layout.minimumHeight: Style.minActivityHeight
Layout.preferredWidth: parent.width
showDismissButton: model.isDismissable

18
src/gui/tray/ActivityItemContent.qml
View file

@ -6,7 +6,7 @@ import QtGraphicalEffects 1.15
import Style 1.0
import com.nextcloud.desktopclient 1.0
Item {
RowLayout {
id: root
property variant activityData: {{}}
@ -23,6 +23,8 @@ Item {
signal dismissButtonClicked()
spacing: Style.standardSpacing
Item {
id: thumbnailItem
@ -30,12 +32,10 @@ Item {
readonly property int imageHeight: height * (1 - Style.thumbnailImageSizeReduction)
readonly property int thumbnailRadius: model.thumbnail && model.thumbnail.isUserAvatar ? width / 2 : 3
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
Layout.fillHeight: true
implicitHeight: model.thumbnail && model.thumbnail.isMimeTypeIcon ? root.iconSize * 0.9 : root.iconSize
implicitWidth: root.iconSize
implicitHeight: model.thumbnail && model.thumbnail.isMimeTypeIcon ? root.iconSize * 0.9 : root.iconSize
Loader {
id: thumbnailImageLoader
@ -118,10 +118,10 @@ Item {
ColumnLayout {
id: activityContentLayout
anchors.left: thumbnailItem.right
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
Layout.fillHeight: true
Layout.fillWidth: true
Layout.maximumWidth: root.width - Style.standardSpacing - root.iconSize
implicitWidth: root.width - Style.standardSpacing - root.iconSize
spacing: Style.smallSpacing

2
src/gui/tray/ActivityList.qml
View file

@ -15,7 +15,7 @@ ScrollView {
signal activityItemClicked(int index)
contentWidth: availableWidth
padding: 1
padding: 0
focus: false
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff

2
theme/Style/Style.qml
View file

@ -50,7 +50,7 @@ QtObject {
// this amount to properly center the sync status icon to the thumbnail
// images, which will work so long as the thumbnails are left aligned
property int standardSpacing: 10
property int standardSpacing: trayHorizontalMargin
property int smallSpacing: 5
property int extraSmallSpacing: 2