AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1124 from amnezia-vpn/bugfix/page-share-recursive-rearrange

Browse source 
bugfix: fixed clientInfoDrawer.expandedHeight recursive rearrange
This commit is contained in:
pokamest 2024-10-24 16:39:04 +01:00 • committed by GitHub
commit 2946dd2278
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

83
client/ui/qml/Pages2/PageShare.qml
View file

@ -772,7 +772,8 @@ PageType {
} }
} }
anchors.fill: parent width: root.width
height: root.height
expandedContent: ColumnLayout { expandedContent: ColumnLayout {
id: expandedContent id: expandedContent
@ -783,8 +784,6 @@ PageType {
anchors.leftMargin: 16 anchors.leftMargin: 16
anchors.rightMargin: 16 anchors.rightMargin: 16
spacing: 8
onImplicitHeightChanged: { onImplicitHeightChanged: {
clientInfoDrawer.expandedHeight = expandedContent.implicitHeight + 32 clientInfoDrawer.expandedHeight = expandedContent.implicitHeight + 32
} }
@ -797,57 +796,54 @@ PageType {
} }
} }
Header2Type { Header2TextType {
Layout.fillWidth: true Layout.maximumWidth: parent.width
headerText: clientName
}
ColumnLayout
{
id: textColumn
property string textColor: AmneziaStyle.color.mutedGray
Layout.bottomMargin: 24 Layout.bottomMargin: 24
ParagraphTextType { text: clientName
color: textColumn.textColor maximumLineCount: 2
visible: creationDate wrapMode: Text.Wrap
Layout.fillWidth: true elide: Qt.ElideRight
}
text: qsTr("Creation date: %1").arg(creationDate) ParagraphTextType {
} color: AmneziaStyle.color.mutedGray
visible: creationDate
Layout.fillWidth: true
ParagraphTextType { text: qsTr("Creation date: %1").arg(creationDate)
color: textColumn.textColor }
visible: latestHandshake
Layout.fillWidth: true
text: qsTr("Latest handshake: %1").arg(latestHandshake) ParagraphTextType {
} color: AmneziaStyle.color.mutedGray
visible: latestHandshake
Layout.fillWidth: true
ParagraphTextType { text: qsTr("Latest handshake: %1").arg(latestHandshake)
color: textColumn.textColor }
visible: dataReceived
Layout.fillWidth: true
text: qsTr("Data received: %1").arg(dataReceived) ParagraphTextType {
} color: AmneziaStyle.color.mutedGray
visible: dataReceived
Layout.fillWidth: true
ParagraphTextType { text: qsTr("Data received: %1").arg(dataReceived)
color: textColumn.textColor }
visible: dataSent
Layout.fillWidth: true
text: qsTr("Data sent: %1").arg(dataSent) ParagraphTextType {
} color: AmneziaStyle.color.mutedGray
visible: dataSent
Layout.fillWidth: true
ParagraphTextType { text: qsTr("Data sent: %1").arg(dataSent)
color: textColumn.textColor }
visible: allowedIps
Layout.fillWidth: true
text: qsTr("Allowed IPs: %1").arg(allowedIps) ParagraphTextType {
} color: AmneziaStyle.color.mutedGray
visible: allowedIps
Layout.fillWidth: true
text: qsTr("Allowed IPs: %1").arg(allowedIps)
} }
Item { Item {
@ -952,6 +948,7 @@ PageType {
BasicButtonType { BasicButtonType {
id: revokeButton id: revokeButton
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 8
defaultColor: AmneziaStyle.color.transparent defaultColor: AmneziaStyle.color.transparent
hoveredColor: AmneziaStyle.color.translucentWhite hoveredColor: AmneziaStyle.color.translucentWhite