From d814484c72e771bffc3a4be16ab8b9b8b2ed3f5f Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Fri, 29 Oct 2021 13:58:07 +0200 Subject: [PATCH] fix: make emoijs work again --- ui/imports/shared/status/StatusChatInput.qml | 1 + ui/imports/shared/status/StatusEmojiSection.qml | 2 +- ui/imports/shared/status/StatusEmojiSuggestionPopup.qml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/imports/shared/status/StatusChatInput.qml b/ui/imports/shared/status/StatusChatInput.qml index f0a8441659..2e622bc069 100644 --- a/ui/imports/shared/status/StatusChatInput.qml +++ b/ui/imports/shared/status/StatusChatInput.qml @@ -13,6 +13,7 @@ import shared.panels 1.0 //TODO remove this dependency import "../../../app/AppLayouts/Chat/panels" +import "./emojiList.js" as EmojiJSON import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 diff --git a/ui/imports/shared/status/StatusEmojiSection.qml b/ui/imports/shared/status/StatusEmojiSection.qml index 06f32e59a5..9ea827a730 100644 --- a/ui/imports/shared/status/StatusEmojiSection.qml +++ b/ui/imports/shared/status/StatusEmojiSection.qml @@ -93,7 +93,7 @@ Item { width: emojiSection.imageWidth height: emojiSection.imageWidth //TODO EMOJI SVG? - source: "../../imports/assets/twemoji/svg/" + modelData.filename + "?22x22" + source: "../../assets/twemoji/svg/" + modelData.filename + "?22x22" MouseArea { cursorShape: Qt.PointingHandCursor diff --git a/ui/imports/shared/status/StatusEmojiSuggestionPopup.qml b/ui/imports/shared/status/StatusEmojiSuggestionPopup.qml index 4e68002d44..4cb8b6b8c2 100644 --- a/ui/imports/shared/status/StatusEmojiSuggestionPopup.qml +++ b/ui/imports/shared/status/StatusEmojiSuggestionPopup.qml @@ -11,7 +11,7 @@ StatusInputListPopup { id: emojiSuggestions getImageSource: function (modelData) { - return `../../imports/assets/twemoji/72x72/${modelData.unicode}.png` + return `../../assets/twemoji/72x72/${modelData.unicode}.png` } getText: function (modelData) { return modelData.shortname