diff options
| author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2022-06-30 16:29:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 16:29:28 +0000 |
| commit | 5bb0c676bd775ffea3406a2951ef727ba0a847f2 (patch) | |
| tree | 4cbfd7e58d8d21592f40e0ea04e5e559de462df2 | |
| parent | Translated using Weblate (Chinese (Simplified)) (diff) | |
| parent | Fix emoji picker (diff) | |
| download | nheko-5bb0c676bd775ffea3406a2951ef727ba0a847f2.tar.xz | |
Merge pull request #1111 from q234rty/master
Fix regressions after #1108
| -rw-r--r-- | resources/qml/dialogs/RoomMembers.qml | 10 | ||||
| -rw-r--r-- | resources/qml/emoji/EmojiPicker.qml | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/resources/qml/dialogs/RoomMembers.qml b/resources/qml/dialogs/RoomMembers.qml index 608a5acf..92aaeef9 100644 --- a/resources/qml/dialogs/RoomMembers.qml +++ b/resources/qml/dialogs/RoomMembers.qml @@ -182,10 +182,10 @@ ApplicationWindow { return "image://colorimage/:/icons/icons/ui/person.svg?"; } - width: 16 - height: 16 - sourceSize.height: height * Screen.devicePixelRatio - sourceSize.width: width * Screen.devicePixelRatio + Layout.preferredWidth: 16 + Layout.preferredHeight: 16 + sourceSize.width: width + sourceSize.height: height source: sourceUrl + (ma.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) ToolTip.visible: ma.hovered ToolTip.text: { @@ -206,6 +206,8 @@ ApplicationWindow { EncryptionIndicator { id: encryptInd + Layout.preferredWidth: 16 + Layout.preferredHeight: 16 Layout.alignment: Qt.AlignRight visible: room.isEncrypted encrypted: room.isEncrypted diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index 6d747f8c..174ea6ae 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -257,6 +257,10 @@ Menu { Layout.preferredWidth: 36 Layout.preferredHeight: 36 hoverEnabled: true + leftPadding: 2 + rightPadding: 2 + topPadding: 2 + bottomPadding: 2 ToolTip.text: { switch (model.category) { case Emoji.Category.People: @@ -294,13 +298,10 @@ Menu { contentItem: Image { horizontalAlignment: Image.AlignHCenter verticalAlignment: Image.AlignVCenter - fillMode: Image.Pad - height: 32 - width: 32 smooth: true mipmap: true - sourceSize.width: 32 * Screen.devicePixelRatio - sourceSize.height: 32 * Screen.devicePixelRatio + sourceSize.width: width + sourceSize.height: height source: "image://colorimage/" + model.image + "?" + (hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) } |