Round images in the image provider

4 files changed, 1 insertions, 18 deletions

diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml

index 9685dde1..c3e8acdb 100644
--- a/resources/qml/Avatar.qml
+++ b/resources/qml/Avatar.qml
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./ui"
-import QtGraphicalEffects 1.0
 import QtQuick 2.6
 import QtQuick.Controls 2.3
 import im.nheko 1.0
@@ -50,8 +49,7 @@ Rectangle {
         smooth: true
         sourceSize.width: avatar.width
         sourceSize.height: avatar.height
-        layer.enabled: true
-        source: avatar.url + ((avatar.crop || !avatar.url) ? "" : "?scale")
+        source: avatar.url ? (avatar.url + "?radius=" + radius + ((avatar.crop) ? "" : "&scale")) : ""
 
         MouseArea {
             id: mouseArea
@@ -65,18 +63,6 @@ Rectangle {
 
         }
 
-        layer.effect: OpacityMask {
-            cached: true
-
-            maskSource: Rectangle {
-                anchors.fill: parent
-                width: avatar.width
-                height: avatar.height
-                radius: Settings.avatarCircles ? height / 2 : 3
-            }
-
-        }
-
     }
 
     Rectangle {
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml

index 79cbd700..e5c6b4ec 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -6,7 +6,6 @@ import "./delegates"
 import "./emoji"
 import "./ui"
 import Qt.labs.platform 1.1 as Platform
-import QtGraphicalEffects 1.0
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.2
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml

index 79f12bbf..cc7d32ea 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -8,7 +8,6 @@ import "./dialogs"
 import "./emoji"
 import "./voip"
 import Qt.labs.platform 1.1 as Platform
-import QtGraphicalEffects 1.0
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.3
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml

index 104da160..c8ac6bc7 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -9,7 +9,6 @@ import "./emoji"
 import "./ui"
 import "./voip"
 import Qt.labs.platform 1.1 as Platform
-import QtGraphicalEffects 1.0
 import QtQuick 2.9
 import QtQuick.Controls 2.5
 import QtQuick.Layouts 1.3