From: Claudio Cambra Date: Fri, 15 Jul 2022 10:47:48 +0000 (+0200) Subject: Fix ActivityItemContent QML paintedWidth errors X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~15^2~93^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e3d897cb7fe53148bdca237a927050c2056f5230;p=nextcloud-desktop.git Fix ActivityItemContent QML paintedWidth errors Signed-off-by: Claudio Cambra --- diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 3e34acf97..5b4e14fad 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -81,16 +81,21 @@ RowLayout { width: model.thumbnail !== undefined ? parent.width * 0.4 : thumbnailItem.imageWidth height: model.thumbnail !== undefined ? width : width * 0.9 + // Prevent bad access into unloaded item properties + readonly property int thumbnailPaintedWidth: thumbnailImageLoader.item ? thumbnailImageLoader.item.paintedWidth : 0 + readonly property int thumbnailPaintedHeight: thumbnailImageLoader.item ? thumbnailImageLoader.item.paintedHeight : 0 + readonly property int negativeLeftMargin: -((width / 2) + ((width - paintedWidth) / 2) + ((thumbnailImageLoader.width - thumbnailItem.imageWidth) / 2) + - ((thumbnailImageLoader.width - thumbnailImageLoader.item.paintedWidth) / 2) + + ((thumbnailImageLoader.width - thumbnailPaintedWidth) / 2) + (thumbnailItem.thumbnailRadius / 4)) readonly property int negativeTopMargin: -((height / 2) + ((height - paintedHeight) / 2) + ((thumbnailImageLoader.height - thumbnailItem.imageHeight) / 4) + - ((thumbnailImageLoader.height - thumbnailImageLoader.item.paintedHeight) / 4) + + ((thumbnailImageLoader.height - thumbnailPaintedHeight) / 4) + (thumbnailItem.thumbnailRadius / 4)) + anchors.verticalCenter: if(model.thumbnail === undefined) parent.verticalCenter anchors.left: model.thumbnail === undefined ? parent.left : thumbnailImageLoader.right anchors.leftMargin: if(model.thumbnail !== undefined) negativeLeftMargin