From c5427180add36c96e91283cce969f2ddbb626a8f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 9 Jan 2017 11:43:10 +0100 Subject: [PATCH] feat(ui/views/App/MainWindow/MainWindow): display a tooltip on account info --- tests/ui/modules/Common/Tooltip/Tooltip.qml | 9 +++++---- tests/ui/views/App/MainWindow/MainWindow.qml | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/ui/modules/Common/Tooltip/Tooltip.qml b/tests/ui/modules/Common/Tooltip/Tooltip.qml index b6768c4bf..2d0a95544 100644 --- a/tests/ui/modules/Common/Tooltip/Tooltip.qml +++ b/tests/ui/modules/Common/Tooltip/Tooltip.qml @@ -10,7 +10,7 @@ import Utils 1.0 ToolTip { id: tooltip - property string _edge: 'left' + property var _edge: 'left' // --------------------------------------------------------------------------- @@ -51,6 +51,7 @@ ToolTip { } else if (a.y > b.y + b.height) { _edge = 'bottom' } else { + _edge = null console.warn('Unable to get the tooltip arrow position.') } } @@ -101,9 +102,9 @@ ToolTip { fillMode: Image.PreserveAspectFit height: TooltipStyle.arrowSize - source: Constants.imagesPath + - 'tooltip_arrow_' + _edge + - Constants.imagesFormat + source: _edge + ? (Constants.imagesPath + 'tooltip_arrow_' + _edge + Constants.imagesFormat) + : '' visible: tooltip.visible && _edge width: TooltipStyle.arrowSize z: Constants.zMax diff --git a/tests/ui/views/App/MainWindow/MainWindow.qml b/tests/ui/views/App/MainWindow/MainWindow.qml index e8149f2c0..e7041a771 100644 --- a/tests/ui/views/App/MainWindow/MainWindow.qml +++ b/tests/ui/views/App/MainWindow/MainWindow.qml @@ -115,6 +115,10 @@ ApplicationWindow { account: AccountSettingsModel + TooltipArea { + text: AccountSettingsModel.sipAddress + } + onClicked: Utils.openWindow('ManageAccounts', window) }