qml: reorganise toolbarTopLayout, so that top-left click opens menu
previously clicking too far left would not open the wallet-menu: - click on label would open it, but - click on wallet-icon or padding to its left would not
This commit is contained in:
@@ -112,34 +112,43 @@ ApplicationWindow
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
|
||||
Item {
|
||||
Layout.preferredWidth: constants.paddingXLarge
|
||||
Layout.preferredHeight: 1
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: constants.iconSizeSmall
|
||||
Layout.preferredHeight: constants.iconSizeSmall
|
||||
visible: Daemon.currentWallet && (!stack.currentItem.title || stack.currentItem.title == Daemon.currentWallet.name)
|
||||
source: '../../icons/wallet.png'
|
||||
}
|
||||
|
||||
Label {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: Math.max(implicitHeight, toolbarTopLayout.height)
|
||||
text: stack.currentItem.title
|
||||
? stack.currentItem.title
|
||||
: Daemon.currentWallet.name
|
||||
elide: Label.ElideRight
|
||||
verticalAlignment: Qt.AlignVCenter
|
||||
font.pixelSize: constants.fontSizeMedium
|
||||
font.bold: true
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: {
|
||||
stack.getRoot().menu.open()
|
||||
stack.getRoot().menu.open() // open wallet-menu
|
||||
stack.getRoot().menu.y = toolbar.height
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
|
||||
Item {
|
||||
Layout.preferredWidth: constants.paddingXLarge
|
||||
Layout.preferredHeight: 1
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: constants.iconSizeSmall
|
||||
Layout.preferredHeight: constants.iconSizeSmall
|
||||
visible: Daemon.currentWallet && (!stack.currentItem.title || stack.currentItem.title == Daemon.currentWallet.name)
|
||||
source: '../../icons/wallet.png'
|
||||
}
|
||||
|
||||
Label {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: Math.max(implicitHeight, toolbarTopLayout.height)
|
||||
text: stack.currentItem.title
|
||||
? stack.currentItem.title
|
||||
: Daemon.currentWallet.name
|
||||
elide: Label.ElideRight
|
||||
verticalAlignment: Qt.AlignVCenter
|
||||
font.pixelSize: constants.fontSizeMedium
|
||||
font.bold: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
@@ -148,7 +157,7 @@ ApplicationWindow
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: openAppMenu()
|
||||
onClicked: openAppMenu() // open global-app-menu
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
|
||||
Reference in New Issue
Block a user