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

use SVGimage for emojis

This commit is contained in:
Iuri Matias 2020-07-06 13:54:41 -04:00
parent 4c2e50ae47
commit 49e76d17bf
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.13
import QtQuick.Controls 2.13 import QtQuick.Controls 2.13
import QtGraphicalEffects 1.13 import QtGraphicalEffects 1.13
import "../../../../imports" import "../../../../imports"
import "../../../../shared"
import "../components" import "../components"
Item { Item {
@ -27,10 +28,10 @@ Item {
color: parent.enabled ? Style.current.blue : Style.current.grey color: parent.enabled ? Style.current.blue : Style.current.grey
radius: 50 radius: 50
} }
Image { SVGImage {
source: "../../../img/arrowUp.svg" source: "../../../img/arrowUp.svg"
width: 12 width: 12
fillMode: Image.PreserveAspectFit // fillMode: Image.PreserveAspectFit
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -48,12 +49,12 @@ Item {
radius: Style.current.radius radius: Style.current.radius
color: hovered ? Style.current.lightBlue : Style.current.transparent color: hovered ? Style.current.lightBlue : Style.current.transparent
Image { SVGImage {
id: emojiIcon id: emojiIcon
visible: txtData.length == 0 visible: txtData.length == 0
width: 20 width: 20
height: 20 height: 20
fillMode: Image.PreserveAspectFit // fillMode: Image.PreserveAspectFit
source: "../../../img/emojiBtn.svg" source: "../../../img/emojiBtn.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter

4
ui/app/AppLayouts/Chat/components/EmojiPopup.qml
View File

@ -72,11 +72,11 @@ Popup {
anchors.fill: parent anchors.fill: parent
anchors.topMargin: emojiGrid.imageMargin anchors.topMargin: emojiGrid.imageMargin
anchors.leftMargin: emojiGrid.imageMargin anchors.leftMargin: emojiGrid.imageMargin
Image { SVGImage {
width: emojiGrid.imageWidth width: emojiGrid.imageWidth
height: emojiGrid.imageWidth height: emojiGrid.imageWidth
source: "../../../../imports/twemoji/26x26/" + filename source: "../../../../imports/twemoji/26x26/" + filename
fillMode: Image.PreserveAspectFit // fillMode: Image.PreserveAspectFit
MouseArea { MouseArea {
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
anchors.fill: parent anchors.fill: parent