fix(@desktop/wallet): Small navigation fixes (#10839)

This commit is contained in:
Cuteivist 2023-05-31 09:47:52 +02:00 committed by GitHub
parent 9f8275ce5c
commit fb85c46727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 12 deletions

View File

@ -1,4 +1,4 @@
import QtQuick 2.13
import QtQuick 2.15
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
@ -30,14 +30,19 @@ TabButton {
leftPadding: 12
rightPadding: 12
background: Item { }
background: Item {
HoverHandler {
target: parent
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.NoButton
enabled: root.enabled
}
}
contentItem: MouseArea {
contentItem: Item {
implicitWidth: contentItemGrid.implicitWidth
implicitHeight: contentItemGrid.implicitHeight + 15
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.NoButton
enabled: root.enabled
RowLayout {

View File

@ -89,6 +89,8 @@ Item {
anchors.fill: parent
changeSelectedAccount: function(address) {
RootStore.setFilterAddress(address)
if (!!rightPanelStackView.currentItem.resetView)
rightPanelStackView.currentItem.resetView()
}
selectAllAccounts: function() {
RootStore.setFillterAllAddresses()

View File

@ -24,6 +24,11 @@ Item {
signal launchShareAddressModal()
function resetView() {
stack.currentIndex = 0
root.currentTabIndex = 0
}
function resetStack() {
stack.currentIndex = 0;
}

View File

@ -224,12 +224,9 @@ ColumnLayout {
width: root.width
visible: !RootStore.historyTransactions.hasMore && transactionListRoot.count !== 0
spacing: 12
Rectangle {
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: Style.current.padding
Layout.preferredWidth: parent.width - 100
Layout.preferredHeight: 1
color: Theme.palette.directColor8
Separator {
Layout.topMargin: Style.current.bigPadding
Layout.fillWidth: true
visible: !RootStore.historyTransactions.hasMore
}
StatusBaseText {
@ -244,7 +241,7 @@ ColumnLayout {
StatusButton {
Layout.alignment: Qt.AlignHCenter
text: qsTr("Back to most recent transaction")
visible: !RootStore.historyTransactions.hasMore
visible: !RootStore.historyTransactions.hasMore && transactionListRoot.contentHeight > transactionListRoot.height
onClicked: transactionListRoot.positionViewAtBeginning()
}
}