Highlighting and cleanup for MemberDelegate
This commit is contained in:
parent
cc937b38c4
commit
338986f022
|
@ -5,16 +5,22 @@ import QtQuick 2.7
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import "../../Base"
|
import "../../Base"
|
||||||
|
|
||||||
MouseArea {
|
HHighlightRectangle {
|
||||||
id: memberDelegate
|
id: memberDelegate
|
||||||
width: memberList.width
|
width: memberList.width
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
|
|
||||||
property var memberInfo: users.find(model.userId)
|
property var memberInfo: users.find(model.userId)
|
||||||
|
|
||||||
|
Row {
|
||||||
|
width: parent.width - leftPadding * 2
|
||||||
|
padding: roomSidePane.currentSpacing / 2
|
||||||
|
leftPadding: roomSidePane.currentSpacing
|
||||||
|
rightPadding: 0
|
||||||
|
|
||||||
HRowLayout {
|
HRowLayout {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
spacing: memberList.spacing
|
spacing: roomSidePane.currentSpacing
|
||||||
|
|
||||||
HUserAvatar {
|
HUserAvatar {
|
||||||
id: avatar
|
id: avatar
|
||||||
|
@ -37,4 +43,5 @@ MouseArea {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,19 +8,9 @@ import "../../Base"
|
||||||
import "../../utils.js" as Utils
|
import "../../utils.js" as Utils
|
||||||
|
|
||||||
HColumnLayout {
|
HColumnLayout {
|
||||||
property bool collapsed: false
|
|
||||||
property int normalSpacing: collapsed ? 0 : 8
|
|
||||||
|
|
||||||
Behavior on normalSpacing { HNumberAnimation {} }
|
|
||||||
|
|
||||||
HListView {
|
HListView {
|
||||||
id: memberList
|
id: memberList
|
||||||
|
bottomMargin: currentSpacing
|
||||||
spacing: normalSpacing
|
|
||||||
topMargin: normalSpacing
|
|
||||||
bottomMargin: normalSpacing
|
|
||||||
Layout.leftMargin: normalSpacing
|
|
||||||
Layout.rightMargin: normalSpacing
|
|
||||||
|
|
||||||
model: HListModel {
|
model: HListModel {
|
||||||
sourceModel: chatPage.roomInfo.members
|
sourceModel: chatPage.roomInfo.members
|
||||||
|
|
|
@ -11,8 +11,12 @@ HRectangle {
|
||||||
property bool collapsed: false
|
property bool collapsed: false
|
||||||
property var activeView: null
|
property var activeView: null
|
||||||
|
|
||||||
|
property int normalSpacing: 8
|
||||||
|
readonly property int currentSpacing: collapsed ? 0 : normalSpacing
|
||||||
|
|
||||||
|
Behavior on normalSpacing { HNumberAnimation {} }
|
||||||
|
|
||||||
MembersView {
|
MembersView {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
collapsed: parent.collapsed
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ HHighlightRectangle {
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
width: parent.width - sidePane.currentSpacing * 2
|
width: parent.width - leftPadding * 2
|
||||||
padding: sidePane.currentSpacing / 2
|
padding: sidePane.currentSpacing / 2
|
||||||
leftPadding: sidePane.currentSpacing
|
leftPadding: sidePane.currentSpacing
|
||||||
rightPadding: 0
|
rightPadding: 0
|
||||||
|
|
|
@ -11,9 +11,9 @@ HRectangle {
|
||||||
// Avoid artifacts when collapsed
|
// Avoid artifacts when collapsed
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
property int normalSpacing: 8
|
|
||||||
property int currentSpacing: collapsed ? 0 : normalSpacing
|
|
||||||
property bool collapsed: false
|
property bool collapsed: false
|
||||||
|
property int normalSpacing: 8
|
||||||
|
readonly property int currentSpacing: collapsed ? 0 : normalSpacing
|
||||||
|
|
||||||
HColumnLayout {
|
HColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
Loading…
Reference in New Issue
Block a user