mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-17 00:07:51 +00:00
Merge pull request #3531
2c51762
DatePicker: FontAwesome fallback icons (rating89us)
This commit is contained in:
commit
7770621a2f
1 changed files with 20 additions and 28 deletions
|
@ -32,6 +32,7 @@ import QtQuick.Controls 2.2 as QtQuickControls2
|
||||||
import QtQuick.Layouts 1.2
|
import QtQuick.Layouts 1.2
|
||||||
import QtGraphicalEffects 1.0
|
import QtGraphicalEffects 1.0
|
||||||
import QtQuick.Controls.Styles 1.2
|
import QtQuick.Controls.Styles 1.2
|
||||||
|
import FontAwesome 1.0
|
||||||
|
|
||||||
import "." as MoneroComponents
|
import "." as MoneroComponents
|
||||||
import "effects/" as MoneroEffects
|
import "effects/" as MoneroEffects
|
||||||
|
@ -221,21 +222,18 @@ Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
|
|
||||||
Image {
|
MoneroEffects.ImageMask {
|
||||||
id: button
|
id: button
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: 10
|
anchors.rightMargin: 10
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
source: "qrc:///images/whiteDropIndicator.png"
|
image: "qrc:///images/whiteDropIndicator.png"
|
||||||
visible: false
|
height: 8
|
||||||
}
|
width: 12
|
||||||
|
fontAwesomeFallbackIcon: FontAwesome.arrowDown
|
||||||
ColorOverlay {
|
fontAwesomeFallbackSize: 14
|
||||||
source: button
|
|
||||||
anchors.fill: button
|
|
||||||
color: MoneroComponents.Style.defaultFontColor
|
color: MoneroComponents.Style.defaultFontColor
|
||||||
rotation: datePicker.expanded ? 180 : 0
|
rotation: datePicker.expanded ? 180 : 0
|
||||||
opacity: 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
@ -397,18 +395,15 @@ Item {
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
width: height
|
width: height
|
||||||
|
|
||||||
Image {
|
MoneroEffects.ImageMask {
|
||||||
id: prevMonthIcon
|
id: prevMonthIcon
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
source: "qrc:///images/prevMonth.png"
|
image: "qrc:///images/prevMonth.png"
|
||||||
visible: false
|
height: 8
|
||||||
}
|
width: 12
|
||||||
|
fontAwesomeFallbackIcon: FontAwesome.arrowLeft
|
||||||
ColorOverlay {
|
fontAwesomeFallbackSize: 14
|
||||||
source: prevMonthIcon
|
|
||||||
anchors.fill: prevMonthIcon
|
|
||||||
color: MoneroComponents.Style.defaultFontColor
|
color: MoneroComponents.Style.defaultFontColor
|
||||||
opacity: 0.5
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
@ -426,19 +421,16 @@ Item {
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
width: height
|
width: height
|
||||||
|
|
||||||
Image {
|
MoneroEffects.ImageMask {
|
||||||
id: nextMonthIcon
|
id: nextMonthIcon
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
source: "qrc:///images/prevMonth.png"
|
image: "qrc:///images/prevMonth.png"
|
||||||
visible: false
|
height: 8
|
||||||
}
|
width: 12
|
||||||
|
|
||||||
ColorOverlay {
|
|
||||||
source: nextMonthIcon
|
|
||||||
anchors.fill: nextMonthIcon
|
|
||||||
color: MoneroComponents.Style.defaultFontColor
|
|
||||||
opacity: 0.5
|
|
||||||
rotation: 180
|
rotation: 180
|
||||||
|
fontAwesomeFallbackIcon: FontAwesome.arrowLeft
|
||||||
|
fontAwesomeFallbackSize: 14
|
||||||
|
color: MoneroComponents.Style.defaultFontColor
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
|
Loading…
Reference in a new issue