Merge pull request #1111 from q234rty/master

Fix regressions after #1108

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

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)
                         }