d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1111 from q234rty/master

Browse source 
Fix regressions after #1108
This commit is contained in:
DeepBlueV7.X 2022-06-30 16:29:28 +00:00 committed by GitHub
commit 5bb0c676bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/dialogs/RoomMembers.qml
View file

@ -182,10 +182,10 @@ ApplicationWindow {
return "image://colorimage/:/icons/icons/ui/person.svg?"; return "image://colorimage/:/icons/icons/ui/person.svg?";
} }
width: 16 Layout.preferredWidth: 16
height: 16 Layout.preferredHeight: 16
sourceSize.height: height * Screen.devicePixelRatio sourceSize.width: width
sourceSize.width: width * Screen.devicePixelRatio sourceSize.height: height
source: sourceUrl + (ma.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) source: sourceUrl + (ma.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
ToolTip.visible: ma.hovered ToolTip.visible: ma.hovered
ToolTip.text: { ToolTip.text: {
@ -206,6 +206,8 @@ ApplicationWindow {
EncryptionIndicator { EncryptionIndicator {
id: encryptInd id: encryptInd
Layout.preferredWidth: 16
Layout.preferredHeight: 16
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
visible: room.isEncrypted visible: room.isEncrypted
encrypted: room.isEncrypted encrypted: room.isEncrypted

11
resources/qml/emoji/EmojiPicker.qml
View file

@ -257,6 +257,10 @@ Menu {
Layout.preferredWidth: 36 Layout.preferredWidth: 36
Layout.preferredHeight: 36 Layout.preferredHeight: 36
hoverEnabled: true hoverEnabled: true
leftPadding: 2
rightPadding: 2
topPadding: 2
bottomPadding: 2
ToolTip.text: { ToolTip.text: {
switch (model.category) { switch (model.category) {
case Emoji.Category.People: case Emoji.Category.People:
@ -294,13 +298,10 @@ Menu {
contentItem: Image { contentItem: Image {
horizontalAlignment: Image.AlignHCenter horizontalAlignment: Image.AlignHCenter
verticalAlignment: Image.AlignVCenter verticalAlignment: Image.AlignVCenter
fillMode: Image.Pad
height: 32
width: 32
smooth: true smooth: true
mipmap: true mipmap: true
sourceSize.width: 32 * Screen.devicePixelRatio sourceSize.width: width
sourceSize.height: 32 * Screen.devicePixelRatio sourceSize.height: height
source: "image://colorimage/" + model.image + "?" + (hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) source: "image://colorimage/" + model.image + "?" + (hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
} }