rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix weird spacing and hidden encryption indicator in top bar

This commit is contained in:
Nicolas Werner 2022-07-16 12:58:17 +02:00
parent dd11188dff
commit f261bbb32d
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/EncryptionIndicator.qml
View File

@ -13,10 +13,12 @@ Image {
property bool encrypted: false
property int trust: Crypto.Unverified
property string unencryptedIcon: ":/icons/icons/ui/shield-filled-cross.svg"
property color unencryptedColor: Nheko.theme.error
property string sourceUrl: {
if (!encrypted)
return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?";
return "image://colorimage/"+unencryptedIcon+"?";
switch (trust) {
case Crypto.Verified:
@ -45,7 +47,7 @@ Image {
return sourceUrl + Nheko.theme.error;
}
} else {
return sourceUrl + Nheko.theme.error;
return sourceUrl + unencryptedColor;
}
}
ToolTip.visible: ma.hovered

7
resources/qml/TopBar.qml
View File

@ -144,10 +144,11 @@ Pane {
contentItem: EncryptionIndicator {
sourceSize.height: parent.Layout.preferredHeight * Screen.devicePixelRatio
sourceSize.width: parent.Layout.preferredWidth * Screen.devicePixelRatio
visible: isEncrypted
encrypted: isEncrypted
trust: trustlevel
enabled: false
unencryptedIcon: ":/icons/icons/ui/people.svg"
unencryptedColor: Nheko.colors.buttonText
}
background: null
@ -155,7 +156,7 @@ Pane {
ToolTip.delay: Nheko.tooltipDelay
ToolTip.text: {
if (!isEncrypted)
return qsTr("This room is not encrypted!");
return qsTr("Show room members.");
switch (trustlevel) {
case Crypto.Verified:
@ -330,7 +331,7 @@ Pane {
Layout.row: 3
Layout.column: 2
Layout.columnSpan: 3
Layout.columnSpan: 1
Layout.fillWidth: true
Layout.preferredHeight: Math.min(contentHeight, Nheko.avatarSize * 1.5)