ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mode without avatar

Browse Source 
It seems that this mode didn't get much love when I added the bubbles so
it was quite broken. This patches removes the bubbles and fix the
alignment issues when using this mode.

We probably should rename it to compact mode in a follow up commit (but
not this one so we can backport it to the stable branch).


(cherry picked from commit dded804f00)
This commit is contained in:
Carl Schwan
2021-05-23 00:36:31 +02:00
parent 530b4c24a0
commit 1e047a8ff1
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imports/NeoChat/Component/Timeline/ReplyComponent.qml
View File

@@ -32,7 +32,7 @@ MouseArea {
id: avatatReply id: avatatReply
anchors.left: replyLeftBorder.right anchors.left: replyLeftBorder.right
anchors.leftMargin: Kirigami.Units.smallSpacing anchors.leftMargin: Kirigami.Units.smallSpacing
width: Kirigami.Units.gridUnit width: visible ? Kirigami.Units.gridUnit : 0
height: Kirigami.Units.gridUnit height: Kirigami.Units.gridUnit
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height

42
imports/NeoChat/Component/Timeline/TimelineContainer.qml
View File

@@ -21,7 +21,7 @@ QQC2.ItemDelegate {
property bool isEmote: false property bool isEmote: false
property bool cardBackground: true property bool cardBackground: true
readonly property int bubbleMaxWidth: Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4, Kirigami.Units.gridUnit * 20) readonly property int bubbleMaxWidth: !Config.showAvatarInTimeline ? width : Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4, Kirigami.Units.gridUnit * 20)
signal saveFileAs() signal saveFileAs()
signal openExternally() signal openExternally()
@@ -48,20 +48,20 @@ QQC2.ItemDelegate {
} }
} }
height: sectionDelegate.height + Math.max(avatar.height, bubble.implicitHeight) + loader.height + (model.showAuthor ? Kirigami.Units.smallSpacing : 0) height: sectionDelegate.height + Math.max(avatar.height, bubble.implicitHeight) + loader.height + (model.showAuthor ? Kirigami.Units.smallSpacing : 0) - (Config.showAvatarInTimeline ? 0 : Kirigami.Units.largeSpacing)
SectionDelegate { SectionDelegate {
id: sectionDelegate id: sectionDelegate
width: parent.width width: parent.width
anchors.left: parent.left anchors.left: avatar.left
anchors.leftMargin: Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing anchors.leftMargin: Kirigami.Units.smallSpacing
visible: model.showSection visible: model.showSection
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
} }
Kirigami.Avatar { Kirigami.Avatar {
id: avatar id: avatar
width: Kirigami.Units.gridUnit * 2 width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0
height: width height: width
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
@@ -74,7 +74,7 @@ QQC2.ItemDelegate {
visible: model.showAuthor && Config.showAvatarInTimeline visible: model.showAuthor && Config.showAvatarInTimeline
name: model.author.name ?? model.author.displayName name: model.author.name ?? model.author.displayName
source: model.author.avatarMediaId ? ("image://mxc/" + model.author.avatarMediaId) : "" source: visible && model.author.avatarMediaId ? ("image://mxc/" + model.author.avatarMediaId) : ""
color: model.author.color color: model.author.color
MouseArea { MouseArea {
@@ -94,7 +94,7 @@ QQC2.ItemDelegate {
QQC2.Control { QQC2.Control {
id: bubble id: bubble
topPadding: Kirigami.Units.largeSpacing topPadding: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
bottomPadding: 0 bottomPadding: 0
leftPadding: 0 leftPadding: 0
rightPadding: 0 rightPadding: 0
@@ -103,6 +103,8 @@ QQC2.ItemDelegate {
top: avatar.top top: avatar.top
left: avatar.right left: avatar.right
leftMargin: Kirigami.Units.smallSpacing leftMargin: Kirigami.Units.smallSpacing
right: Config.showAvatarInTimeline ? undefined : parent.right
rightMargin: Config.showAvatarInTimeline ? undefined : Kirigami.Units.largeSpacing
} }
contentItem: ColumnLayout { contentItem: ColumnLayout {
@@ -112,10 +114,10 @@ QQC2.ItemDelegate {
id: rowLayout id: rowLayout
visible: model.showAuthor && !isEmote visible: model.showAuthor && !isEmote
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
Layout.rightMargin: Kirigami.Units.largeSpacing Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing
Layout.maximumWidth: bubbleMaxWidth - Kirigami.Units.largeSpacing * 2 Layout.maximumWidth: bubbleMaxWidth
implicitHeight: visible ? nameLabel.implicitHeight : 0 implicitHeight: visible ? nameLabel.implicitHeight : 0
QQC2.Label { QQC2.Label {
@@ -131,6 +133,19 @@ QQC2.ItemDelegate {
font.weight: Font.Bold font.weight: Font.Bold
color: author.color color: author.color
wrapMode: Text.Wrap wrapMode: Text.Wrap
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
room: currentRoom,
user: author.object,
displayName: author.displayName,
avatarMediaId: author.avatarMediaId,
avatarUrl: author.avatarUrl
}).open();
}
}
} }
QQC2.Label { QQC2.Label {
id: timeLabel id: timeLabel
@@ -157,7 +172,7 @@ QQC2.ItemDelegate {
} }
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
visible: cardBackground visible: cardBackground && Config.showAvatarInTimeline
color: model.isHighlighted ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor color: model.isHighlighted ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.smallSpacing
shadow.size: Kirigami.Units.smallSpacing shadow.size: Kirigami.Units.smallSpacing
@@ -170,13 +185,12 @@ QQC2.ItemDelegate {
Loader { Loader {
id: loader id: loader
anchors { anchors {
left: parent.left left: bubble.left
leftMargin: Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing * 2
right: parent.right right: parent.right
top: bubble.bottom top: bubble.bottom
topMargin: active ? Kirigami.Units.smallSpacing : 0 topMargin: active && Config.showAvatarInTimeline ? Kirigami.Units.smallSpacing : 0
} }
height: active ? item.implicitHeight + Kirigami.Units.smallSpacing : 0 height: active ? item.implicitHeight : 0
//Layout.bottomMargin: readMarker ? Kirigami.Units.smallSpacing : 0 //Layout.bottomMargin: readMarker ? Kirigami.Units.smallSpacing : 0
active: eventType !== "state" && eventType !== "notice" && reaction != undefined && reaction.length > 0 active: eventType !== "state" && eventType !== "notice" && reaction != undefined && reaction.length > 0
visible: active visible: active

9
imports/NeoChat/Page/RoomPage.qml
View File

@@ -343,9 +343,10 @@ Kirigami.ScrollablePage {
innerObject: TextDelegate { innerObject: TextDelegate {
isEmote: true isEmote: true
Layout.fillWidth: !Config.showAvatarInTimeline
Layout.maximumWidth: emoteContainer.bubbleMaxWidth Layout.maximumWidth: emoteContainer.bubbleMaxWidth
Layout.rightMargin: Kirigami.Units.largeSpacing Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
TapHandler { TapHandler {
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
@@ -369,10 +370,11 @@ Kirigami.ScrollablePage {
hoverComponent: hoverActions hoverComponent: hoverActions
innerObject: TextDelegate { innerObject: TextDelegate {
Layout.fillWidth: !Config.showAvatarInTimeline
Layout.maximumWidth: messageContainer.bubbleMaxWidth Layout.maximumWidth: messageContainer.bubbleMaxWidth
Layout.rightMargin: Kirigami.Units.largeSpacing Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
TapHandler { TapHandler {
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
onTapped: openMessageContext(author, model.message, eventId, toolTip, eventType, model.formattedBody) onTapped: openMessageContext(author, model.message, eventId, toolTip, eventType, model.formattedBody)
@@ -394,9 +396,10 @@ Kirigami.ScrollablePage {
onReplyClicked: goToEvent(eventID) onReplyClicked: goToEvent(eventID)
innerObject: TextDelegate { innerObject: TextDelegate {
Layout.fillWidth: !Config.showAvatarInTimeline
Layout.maximumWidth: noticeContainer.bubbleMaxWidth Layout.maximumWidth: noticeContainer.bubbleMaxWidth
Layout.rightMargin: Kirigami.Units.largeSpacing Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
} }
} }