Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve peer delegate #375

Merged
merged 2 commits into from
Dec 2, 2023
Merged

Improve peer delegate #375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c2d951
qml: improve peer delegate
promag Nov 30, 2023
c54c973
qml: change peer delegate layout
promag Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 55 additions & 70 deletions src/qml/pages/node/Peers.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,55 +153,22 @@ Page {
}
}

delegate: Item {
delegate: ItemDelegate {
id: delegate
required property int nodeId;
required property string address;
required property string subversion;
required property string direction;
required property string connectionType;
required property string network;
property color stateColor;
implicitHeight: 60
implicitWidth: listView.width
state: "FILLED"

states: [
State {
name: "FILLED"
PropertyChanges { target: delegate; stateColor: Theme.color.neutral9 }
},
State {
name: "HOVER"
PropertyChanges { target: delegate; stateColor: Theme.color.orangeLight1 }
},
State {
name: "ACTIVE"
PropertyChanges { target: delegate; stateColor: Theme.color.orange }
}
]

MouseArea {
anchors.fill: parent
hoverEnabled: AppMode.isDesktop
onEntered: {
delegate.state = "HOVER"
}
onExited: {
delegate.state = "FILLED"
}
onPressed: {
delegate.state = "ACTIVE"
}
onReleased: {
if (mouseArea.containsMouse) {
delegate.state = "HOVER"
} else {
delegate.state = "FILLED"
}
readonly property color stateColor: {
if (delegate.down) {
return Theme.color.orange
} else if (delegate.hovered) {
return Theme.color.orangeLight1
}
return Theme.color.neutral9
}

Connections {
target: peerListModelProxy
function onSortByChanged(roleName) {
Expand Down Expand Up @@ -254,41 +221,59 @@ Page {
quaternary.text = subversion
}
}

ColumnLayout {
anchors.left: parent.left
CoreText {
Layout.alignment: Qt.AlignLeft
id: primary
font.pixelSize: 18
color: delegate.stateColor
}
CoreText {
Layout.alignment: Qt.AlignLeft
id: tertiary
font.pixelSize: 15
color: Theme.color.neutral7
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 14
width: listView.width
background: Item {
Separator {
anchors.bottom: parent.bottom
width: parent.width
}
}
ColumnLayout {
anchors.right: parent.right
CoreText {
Layout.alignment: Qt.AlignRight
id: secondary
font.pixelSize: 18
color: delegate.stateColor
contentItem: ColumnLayout {
RowLayout {
Layout.fillWidth: true
spacing: 15
CoreText {
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
Layout.preferredWidth: 0
id: primary
font.pixelSize: 18
color: delegate.stateColor
elide: Text.ElideMiddle
wrapMode: Text.NoWrap
horizontalAlignment: Text.AlignLeft
}
CoreText {
Layout.alignment: Qt.AlignRight
id: secondary
font.pixelSize: 18
color: delegate.stateColor
}
}
CoreText {
Layout.alignment: Qt.AlignRight
id: quaternary
font.pixelSize: 15
color: Theme.color.neutral7
RowLayout {
CoreText {
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
Layout.preferredWidth: 0
id: tertiary
font.pixelSize: 15
color: Theme.color.neutral7
elide: Text.ElideMiddle
wrapMode: Text.NoWrap
horizontalAlignment: Text.AlignLeft
}
CoreText {
Layout.alignment: Qt.AlignRight
id: quaternary
font.pixelSize: 15
color: Theme.color.neutral7
}
}
}
Separator {
anchors.bottom: parent.bottom
width: parent.width
}
}
}
}
Loading