diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 00fe0c89..a4a243e0 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -51,6 +51,7 @@ Item { property alias tooltip: tooltip.text property alias tooltipLeft: tooltip.tooltipLeft property alias tooltipPopup: tooltip.tooltipPopup + property alias maximumTooltipWidth: tooltip.maximumTooltipWidth signal clicked() height: small ? 30 : 36 diff --git a/components/Tooltip.qml b/components/Tooltip.qml index c19d05e2..4a1806e7 100644 --- a/components/Tooltip.qml +++ b/components/Tooltip.qml @@ -34,11 +34,14 @@ import FontAwesome 1.0 import "." as MoneroComponents Rectangle { + id: root property alias text: tooltip.text property alias tooltipPopup: popup + property alias maximumTooltipWidth: root.maximumTooltipWidth property bool tooltipIconVisible: false property bool tooltipLeft: false property bool tooltipBottom: tooltipIconVisible ? false : true + property int maximumTooltipWidth: 370 color: "transparent" height: tooltipIconVisible ? icon.height : parent.height @@ -95,12 +98,12 @@ Rectangle { delay: 200 RowLayout { - Layout.maximumWidth: 370 + Layout.maximumWidth: maximumTooltipWidth Text { id: tooltip width: contentWidth - Layout.maximumWidth: 370 + Layout.maximumWidth: maximumTooltipWidth color: MoneroComponents.Style.defaultFontColor font.family: MoneroComponents.Style.fontRegular.name font.pixelSize: 12 diff --git a/pages/Receive.qml b/pages/Receive.qml index 8c3df3bf..8cc85246 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -494,7 +494,10 @@ Rectangle { small: true text: qsTr("Show on device") + translationManager.emptyString fontSize: 14 - visible: appWindow.currentWallet ? appWindow.currentWallet.isHwBacked() : false + visible: appWindow.currentWallet ? appWindow.currentWallet.isHwBacked() && pageReceive.state == "Address" : false + tooltip: qsTr("Display this receiving address in your hardware wallet, to confirm if it was indeed generated by your device") + translationManager.emptyString + tooltipLeft: false + maximumTooltipWidth: 200 onClicked: { appWindow.currentWallet.deviceShowAddressAsync( appWindow.currentWallet.currentSubaddressAccount,