4 files changed, 8 insertions, 4 deletions
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml
index 53124f28..5a28b5de 100644
--- a/resources/qml/Avatar.qml
+++ b/resources/qml/Avatar.qml
@@ -57,7 +57,9 @@ AbstractButton {
fillMode: avatar.crop ? Image.PreserveAspectCrop : Image.PreserveAspectFit
mipmap: true
smooth: true
- source: if (avatar.url.startsWith('image://')) {
+ source: if (avatar.url.startsWith('image://colorimage')) {
+ return avatar.url + "&radius=" + (Settings.avatarCircles ? 100 : 25) + ((avatar.crop) ? "" : "&scale");
+ } else if (avatar.url.startsWith('image://')) {
return avatar.url + "?radius=" + (Settings.avatarCircles ? 100 : 25) + ((avatar.crop) ? "" : "&scale");
} else if (avatar.url.startsWith(':/')) {
return "image://colorimage/" + avatar.url + "?" + textColor;
diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml
index 62a29a2d..d93f5900 100644
--- a/resources/qml/CommunitiesList.qml
+++ b/resources/qml/CommunitiesList.qml
@@ -146,8 +146,10 @@ Page {
url: {
if (model.avatarUrl.startsWith("mxc://"))
return model.avatarUrl.replace("mxc://", "image://MxcImage/");
- else
+ else if (model.avatarUrl.length > 0)
return "image://colorimage/" + model.avatarUrl + "?" + communityItem.unimportantText;
+ else
+ return "";
}
width: avatarSize
diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index bd2628bb..90e6560c 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -41,7 +41,7 @@ Popup {
font.pixelSize: Math.ceil(quickSwitcher.textHeight * 0.6)
width: parent.width
- Keys.onPressed: (event) => {
+ Keys.onPressed: event => {
if (event.key == Qt.Key_Up || event.key == Qt.Key_Backtab) {
event.accepted = true;
completerPopup.up();
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 36c366a9..ac4f8c3a 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -568,8 +568,8 @@ Page {
spacing: Nheko.paddingSmall
Item {
- Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom
+ Layout.fillWidth: true
ElidedLabel {
anchors.bottom: parent.bottom
|
