From 2c517623a16c2c765b5f16a19ce6006adf3b985d Mon Sep 17 00:00:00 2001 From: rating89us <45968869+rating89us@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:40:06 +0200 Subject: [PATCH] DatePicker: FontAwesome fallback icons --- components/DatePicker.qml | 48 ++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/components/DatePicker.qml b/components/DatePicker.qml index 8a79b2e8..f9290d6c 100644 --- a/components/DatePicker.qml +++ b/components/DatePicker.qml @@ -32,6 +32,7 @@ import QtQuick.Controls 2.2 as QtQuickControls2 import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 import QtQuick.Controls.Styles 1.2 +import FontAwesome 1.0 import "." as MoneroComponents import "effects/" as MoneroEffects @@ -221,21 +222,18 @@ Item { Layout.fillWidth: true color: "transparent" - Image { + MoneroEffects.ImageMask { id: button anchors.right: parent.right anchors.rightMargin: 10 anchors.verticalCenter: parent.verticalCenter - source: "qrc:///images/whiteDropIndicator.png" - visible: false - } - - ColorOverlay { - source: button - anchors.fill: button + image: "qrc:///images/whiteDropIndicator.png" + height: 8 + width: 12 + fontAwesomeFallbackIcon: FontAwesome.arrowDown + fontAwesomeFallbackSize: 14 color: MoneroComponents.Style.defaultFontColor rotation: datePicker.expanded ? 180 : 0 - opacity: 1 } MouseArea { @@ -397,18 +395,15 @@ Item { anchors.bottom: parent.bottom width: height - Image { + MoneroEffects.ImageMask { id: prevMonthIcon anchors.centerIn: parent - source: "qrc:///images/prevMonth.png" - visible: false - } - - ColorOverlay { - source: prevMonthIcon - anchors.fill: prevMonthIcon + image: "qrc:///images/prevMonth.png" + height: 8 + width: 12 + fontAwesomeFallbackIcon: FontAwesome.arrowLeft + fontAwesomeFallbackSize: 14 color: MoneroComponents.Style.defaultFontColor - opacity: 0.5 } MouseArea { @@ -426,19 +421,16 @@ Item { anchors.bottom: parent.bottom width: height - Image { + MoneroEffects.ImageMask { id: nextMonthIcon anchors.centerIn: parent - source: "qrc:///images/prevMonth.png" - visible: false - } - - ColorOverlay { - source: nextMonthIcon - anchors.fill: nextMonthIcon - color: MoneroComponents.Style.defaultFontColor - opacity: 0.5 + image: "qrc:///images/prevMonth.png" + height: 8 + width: 12 rotation: 180 + fontAwesomeFallbackIcon: FontAwesome.arrowLeft + fontAwesomeFallbackSize: 14 + color: MoneroComponents.Style.defaultFontColor } MouseArea {