Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Cambra <claudio.cambra@gmail.com>2022-07-15 13:47:48 +0300
committerClaudio Cambra <claudio.cambra@gmail.com>2022-07-18 16:13:58 +0300
commite3d897cb7fe53148bdca237a927050c2056f5230 (patch)
treef17586b53dd07cbace2932074f5f6aba2c922f2a /src/gui/tray
parentdee460735ebedc571fa85d5b5a98556c9779ef9a (diff)
Fix ActivityItemContent QML paintedWidth errors
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Diffstat (limited to 'src/gui/tray')
-rw-r--r--src/gui/tray/ActivityItemContent.qml9
1 files changed, 7 insertions, 2 deletions
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