AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: reorganise toolbarTopLayout, so that top-left click opens menu

Browse Source 
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:
SomberNight
2023-03-21 17:51:29 +00:00
parent 98304662ca
commit 558eb1a372
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
electrum/gui/qml/components/main.qml
View File

@@ -112,34 +112,43 @@ ApplicationWindow
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Item { 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.fillWidth: true
Layout.preferredHeight: Math.max(implicitHeight, toolbarTopLayout.height) 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 { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
stack.getRoot().menu.open() stack.getRoot().menu.open() // open wallet-menu
stack.getRoot().menu.y = toolbar.height 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 { Item {
@@ -148,7 +157,7 @@ ApplicationWindow
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: openAppMenu() onClicked: openAppMenu() // open global-app-menu
} }
RowLayout { RowLayout {