From 49e76d17bfaebe64f36ba997b4f41467f953f0cb Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Mon, 6 Jul 2020 13:54:41 -0400 Subject: [PATCH] use SVGimage for emojis --- ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml | 9 +++++---- ui/app/AppLayouts/Chat/components/EmojiPopup.qml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml index d267cf5437..787feb1379 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtGraphicalEffects 1.13 import "../../../../imports" +import "../../../../shared" import "../components" Item { @@ -27,10 +28,10 @@ Item { color: parent.enabled ? Style.current.blue : Style.current.grey radius: 50 } - Image { + SVGImage { source: "../../../img/arrowUp.svg" width: 12 - fillMode: Image.PreserveAspectFit + // fillMode: Image.PreserveAspectFit anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter } @@ -48,12 +49,12 @@ Item { radius: Style.current.radius color: hovered ? Style.current.lightBlue : Style.current.transparent - Image { + SVGImage { id: emojiIcon visible: txtData.length == 0 width: 20 height: 20 - fillMode: Image.PreserveAspectFit + // fillMode: Image.PreserveAspectFit source: "../../../img/emojiBtn.svg" anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter diff --git a/ui/app/AppLayouts/Chat/components/EmojiPopup.qml b/ui/app/AppLayouts/Chat/components/EmojiPopup.qml index 553eea980c..f394345b8a 100644 --- a/ui/app/AppLayouts/Chat/components/EmojiPopup.qml +++ b/ui/app/AppLayouts/Chat/components/EmojiPopup.qml @@ -72,11 +72,11 @@ Popup { anchors.fill: parent anchors.topMargin: emojiGrid.imageMargin anchors.leftMargin: emojiGrid.imageMargin - Image { + SVGImage { width: emojiGrid.imageWidth height: emojiGrid.imageWidth source: "../../../../imports/twemoji/26x26/" + filename - fillMode: Image.PreserveAspectFit + // fillMode: Image.PreserveAspectFit MouseArea { cursorShape: Qt.PointingHandCursor anchors.fill: parent