Improve overall theme and pane colors
This commit is contained in:
@@ -6,9 +6,9 @@ import "../../../Base"
|
||||
|
||||
HTileDelegate {
|
||||
id: memberDelegate
|
||||
backgroundColor: theme.chat.roomPane.member.background
|
||||
backgroundColor: theme.chat.roomPane.listView.member.background
|
||||
contentOpacity:
|
||||
model.invited ? theme.chat.roomPane.member.invitedOpacity : 1
|
||||
model.invited ? theme.chat.roomPane.listView.member.invitedOpacity : 1
|
||||
|
||||
image: HUserAvatar {
|
||||
userId: model.id
|
||||
@@ -23,10 +23,10 @@ HTileDelegate {
|
||||
title.color:
|
||||
memberDelegate.hovered ?
|
||||
utils.nameColor(model.display_name || model.id.substring(1)) :
|
||||
theme.chat.roomPane.member.name
|
||||
theme.chat.roomPane.listView.member.name
|
||||
|
||||
subtitle.text: model.display_name ? model.id : ""
|
||||
subtitle.color: theme.chat.roomPane.member.subtitle
|
||||
subtitle.color: theme.chat.roomPane.listView.member.subtitle
|
||||
|
||||
contextMenu: HMenu {
|
||||
HMenuItem {
|
||||
|
@@ -27,56 +27,72 @@ HColumnLayout {
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
z: -100
|
||||
color: theme.chat.roomPane.listView.background
|
||||
}
|
||||
}
|
||||
|
||||
HRowLayout {
|
||||
Rectangle {
|
||||
color: theme.chat.roomPane.bottomBar.background
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.minimumHeight: theme.baseElementsHeight
|
||||
Layout.maximumHeight: Layout.minimumHeight
|
||||
|
||||
HTextField {
|
||||
id: filterField
|
||||
saveName: "memberFilterField"
|
||||
saveId: chat.roomId
|
||||
HRowLayout {
|
||||
anchors.fill: parent
|
||||
|
||||
placeholderText: qsTr("Filter members")
|
||||
backgroundColor: theme.chat.roomPane.filterMembers.background
|
||||
bordered: false
|
||||
opacity: width >= 16 * theme.uiScale ? 1 : 0
|
||||
HTextField {
|
||||
id: filterField
|
||||
saveName: "memberFilterField"
|
||||
saveId: chat.roomId
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
placeholderText: qsTr("Filter members")
|
||||
backgroundColor:
|
||||
theme.chat.roomPane.bottomBar.filterMembers.background
|
||||
bordered: false
|
||||
opacity: width >= 16 * theme.uiScale ? 1 : 0
|
||||
|
||||
Behavior on opacity { HNumberAnimation {} }
|
||||
}
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
HButton {
|
||||
id: inviteButton
|
||||
icon.name: "room-send-invite"
|
||||
backgroundColor: theme.chat.roomPane.inviteButton.background
|
||||
enabled: chat.roomInfo.can_invite
|
||||
Behavior on opacity { HNumberAnimation {} }
|
||||
}
|
||||
|
||||
toolTip.text:
|
||||
enabled ?
|
||||
qsTr("Invite members to this room") :
|
||||
qsTr("No permission to invite members to this room")
|
||||
HButton {
|
||||
id: inviteButton
|
||||
icon.name: "room-send-invite"
|
||||
backgroundColor:
|
||||
theme.chat.roomPane.bottomBar.inviteButton.background
|
||||
enabled: chat.roomInfo.can_invite
|
||||
|
||||
topPadding: 0 // XXX
|
||||
bottomPadding: 0
|
||||
toolTip.text:
|
||||
enabled ?
|
||||
qsTr("Invite members to this room") :
|
||||
qsTr("No permission to invite members to this room")
|
||||
|
||||
onClicked: utils.makePopup(
|
||||
"Popups/InviteToRoomPopup.qml",
|
||||
chat,
|
||||
{
|
||||
userId: chat.userId,
|
||||
roomId: chat.roomId,
|
||||
roomName: chat.roomInfo.display_name,
|
||||
invitingAllowed: Qt.binding(() => inviteButton.enabled),
|
||||
},
|
||||
)
|
||||
topPadding: 0 // XXX
|
||||
bottomPadding: 0
|
||||
|
||||
// onEnabledChanged: if (openedPopup && ! enabled)
|
||||
onClicked: utils.makePopup(
|
||||
"Popups/InviteToRoomPopup.qml",
|
||||
chat,
|
||||
{
|
||||
userId: chat.userId,
|
||||
roomId: chat.roomId,
|
||||
roomName: chat.roomInfo.display_name,
|
||||
invitingAllowed:
|
||||
Qt.binding(() => inviteButton.enabled),
|
||||
},
|
||||
)
|
||||
|
||||
Layout.fillHeight: true
|
||||
// onEnabledChanged: if (openedPopup && ! enabled)
|
||||
|
||||
Layout.fillHeight: true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -9,8 +9,8 @@ MultiviewPane {
|
||||
saveName: "roomPane"
|
||||
edge: Qt.RightEdge
|
||||
|
||||
buttonsBackgroundColor: theme.chat.roomPaneButtons.background
|
||||
backgroundColor: theme.chat.roomPane.background
|
||||
buttonsBackgroundColor: theme.chat.roomPane.topBar.background
|
||||
background: Rectangle { color: theme.chat.roomPane.background }
|
||||
|
||||
|
||||
buttonRepeater.model: [
|
||||
|
@@ -154,7 +154,7 @@ HRowLayout {
|
||||
(pureMedia ? 0 : parent.leftPadding + parent.rightPadding),
|
||||
)
|
||||
height: contentColumn.height
|
||||
z: -1
|
||||
z: -100
|
||||
color: isOwn?
|
||||
theme.chat.message.ownBackground :
|
||||
theme.chat.message.background
|
||||
|
Reference in New Issue
Block a user