status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@chat): Used `StatusEmoji` component

This commit is contained in:
Igor Sirotin 2022-05-23 14:35:51 +03:00
parent 718cc1f45c
commit 7b001b5099
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ

@ -1 +1 @@
Subproject commit e1db6393404a85f91e7452575f6a0bc921caf6c6
Subproject commit 485647d1c36a6bd87ac8715f3989f0052621b816

5
ui/imports/shared/controls/EmojiHash.qml
View File

@ -1,6 +1,7 @@
import QtQuick 2.13
import StatusQ.Core.Utils 0.1 as StatusQUtils
import StatusQ.Components 0.1
import utils 1.0
import shared.panels 1.0
@ -25,10 +26,10 @@ Item {
Repeater {
model: Utils.getEmojiHashAsJson(root.publicKey)
SVGImage {
StatusEmoji {
width: root.size
height: root.size
source: Style.emoji(StatusQUtils.Emoji.iconId(modelData))
emojiId: StatusQUtils.Emoji.iconId(modelData)
}
}
}

9
ui/imports/shared/status/StatusEmojiPopup.qml
View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import StatusQ.Controls 0.1
import StatusQ.Components 0.1
import StatusQ.Core.Utils 0.1 as StatusQUtils
import utils 1.0
@ -244,10 +245,10 @@ Popup {
Repeater {
id: skinColorEmojiRepeater
model: ["1f590-1f3fb", "1f590-1f3fc", "1f590-1f3fd", "1f590-1f3fe", "1f590-1f3ff", "1f590"]
delegate: SVGImage {
delegate: StatusEmoji {
width: 22
height: 22
source: Style.emoji(modelData)
emojiId: modelData
MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
@ -261,14 +262,14 @@ Popup {
}
}
SVGImage {
StatusEmoji {
width: 22
height: 22
anchors.verticalCenter: searchBox.verticalCenter
anchors.right: parent.right
anchors.rightMargin: emojiHeader.headerMargin
visible: !skinToneEmoji.expandSkinColorOptions
source: Style.emoji("1f590" + ((localAccountSensitiveSettings.skinColor !== "" && visible) ? ("-" + localAccountSensitiveSettings.skinColor) : ""))
emojiId: "1f590" + ((localAccountSensitiveSettings.skinColor !== "" && visible) ? ("-" + localAccountSensitiveSettings.skinColor) : "")
MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent

5
ui/imports/shared/status/StatusEmojiSection.qml
View File

@ -5,6 +5,7 @@ import utils 1.0
import shared 1.0
import shared.panels 1.0
import StatusQ.Components 0.1
Item {
id: emojiSection
@ -89,10 +90,10 @@ Item {
anchors.topMargin: emojiSection.imageMargin
anchors.leftMargin: emojiSection.imageMargin
SVGImage {
StatusEmoji {
width: emojiSection.imageWidth
height: emojiSection.imageWidth
source: Style.emoji(modelData.filename)
emojiId: modelData.filename
MouseArea {
cursorShape: Qt.PointingHandCursor