From b64dcaa14f05261289e058be291356c9426b5d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Wed, 30 Nov 2022 16:41:25 +0100 Subject: [PATCH] fix(general): removed not working code for cropping tmp profile image It was a source of warnings in the app and storybook. Closes: #8519 --- ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml | 7 +------ ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml | 3 --- ui/imports/shared/controls/chat/ProfileHeader.qml | 3 +-- ui/imports/shared/controls/chat/UserImage.qml | 3 --- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml b/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml index 9dd55e312e..e85127a9b0 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml @@ -42,12 +42,7 @@ Loader { color: root.asset.imgIsIdenticon ? Theme.palette.statusRoundedImage.backgroundColor : root.asset.bgColor - image.fillMode: root.asset.cropRect ? Image.PreserveAspectCrop - : Image.PreserveAspectFit - image.x: root.asset.cropRectangle ? -root.asset.cropRectangle.x - : 0 - image.y: root.asset.cropRectangle ? -root.asset.cropRectangle.y - : 0 + image.fillMode: Image.PreserveAspectCrop } Loader { anchors.centerIn: parent diff --git a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml index 3369c92869..bdd7ba6526 100644 --- a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml +++ b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml @@ -34,7 +34,4 @@ QtObject { property bool isImage: false property int imgStatus property bool imgIsIdenticon: false - - // crop - property rect cropRect } diff --git a/ui/imports/shared/controls/chat/ProfileHeader.qml b/ui/imports/shared/controls/chat/ProfileHeader.qml index aef06f4a2d..6a42bdb70b 100644 --- a/ui/imports/shared/controls/chat/ProfileHeader.qml +++ b/ui/imports/shared/controls/chat/ProfileHeader.qml @@ -27,7 +27,7 @@ Item { property bool isContact: false property bool isCurrentUser property bool userIsEnsVerified - property rect cropRect: undefined + property rect cropRect property int imageSize: ProfileHeader.ImageSize.Compact property bool displayNameVisible: true @@ -83,7 +83,6 @@ Item { imageWidth: d.getSize(36, 64, 160) imageHeight: imageWidth showRing: !root.userIsEnsVerified - cropRect: root.cropRect } StatusRoundButton { diff --git a/ui/imports/shared/controls/chat/UserImage.qml b/ui/imports/shared/controls/chat/UserImage.qml index ae9957bffe..620bd3aa10 100644 --- a/ui/imports/shared/controls/chat/UserImage.qml +++ b/ui/imports/shared/controls/chat/UserImage.qml @@ -20,8 +20,6 @@ Loader { property bool interactive: true property bool disabled: false - property rect cropRect: undefined - property int colorId: Utils.colorIdForPubkey(pubkey) property var colorHash: Utils.getColorHashAsJson(pubkey) @@ -36,7 +34,6 @@ Loader { name: root.image charactersLen: 2 isImage: true - cropRect: root.cropRect } ringSettings { ringSpecModel: root.showRing ? root.colorHash : undefined