Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compact mode for messages

Browse Source
This commit is contained in:
miruka 2020-03-22 13:05:35 -04:00
parent 5d513f84fa
commit ce7c986e5b
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/Pages/Chat/Timeline/EventContent.qml
View File

@ -13,9 +13,10 @@ HRowLayout {
readonly property string senderText: readonly property string senderText:
hideNameLine ? "" : ( hideNameLine ? "" : (
"<div class='sender'>" + `<${smallAvatar ? "span" : "div"} class='sender'>` +
utils.coloredNameHtml(model.sender_name, model.sender_id) + utils.coloredNameHtml(model.sender_name, model.sender_id) +
"</div>" (smallAvatar ? ": " : "") +
(smallAvatar ? "</span>" : "</div>")
) )
property string contentText: utils.processedEventText(model) property string contentText: utils.processedEventText(model)
readonly property string timeText: utils.formatTime(model.date, false) readonly property string timeText: utils.formatTime(model.date, false)
@ -60,11 +61,12 @@ HRowLayout {
opacity: collapseAvatar ? 0 : 1 opacity: collapseAvatar ? 0 : 1
visible: ! hideAvatar visible: ! hideAvatar
Layout.minimumWidth: theme.chat.message.avatarSize Layout.minimumWidth:
Layout.minimumHeight: smallAvatar ?
collapseAvatar ? 1 : theme.chat.message.collapsedAvatarSize :
smallAvatar ? theme.chat.message.collapsedAvatarSize : theme.chat.message.avatarSize
Layout.minimumWidth
Layout.minimumHeight: collapseAvatar ? 1 : Layout.minimumWidth
Layout.maximumWidth: Layout.minimumWidth Layout.maximumWidth: Layout.minimumWidth
Layout.maximumHeight: Layout.minimumHeight Layout.maximumHeight: Layout.minimumHeight
@ -76,7 +78,7 @@ HRowLayout {
displayName: model.sender_name displayName: model.sender_name
mxc: model.sender_avatar mxc: model.sender_avatar
width: parent.width width: parent.width
height: collapseAvatar ? 1 : theme.chat.message.avatarSize height: collapseAvatar ? 1 : parent.Layout.minimumWidth
radius: theme.chat.message.avatarRadius radius: theme.chat.message.avatarRadius
} }
} }

11
src/gui/Pages/Chat/Timeline/EventDelegate.qml
View File

@ -20,6 +20,7 @@ HColumnLayout {
readonly property var nextModel: eventList.model.get(model.index - 1) readonly property var nextModel: eventList.model.get(model.index - 1)
readonly property QtObject currentModel: model readonly property QtObject currentModel: model
property bool compact: window.settings.alwaysUseCompactMode
property bool isOwn: chat.userId === model.sender_id property bool isOwn: chat.userId === model.sender_id
property bool onRight: eventList.ownEventsOnRight && isOwn property bool onRight: eventList.ownEventsOnRight && isOwn
property bool combine: eventList.canCombine(previousModel, model) property bool combine: eventList.canCombine(previousModel, model)
@ -27,10 +28,12 @@ HColumnLayout {
property bool dayBreak: eventList.canDayBreak(previousModel, model) property bool dayBreak: eventList.canDayBreak(previousModel, model)
readonly property bool smallAvatar: readonly property bool smallAvatar:
eventList.canCombine(model, nextModel) && compact || (
(model.event_type === "RoomMessageEmote" || eventList.canCombine(model, nextModel) &&
! (model.event_type.startsWith("RoomMessage") || (model.event_type === "RoomMessageEmote" ||
model.event_type.startsWith("RoomEncrypted"))) ! (model.event_type.startsWith("RoomMessage") ||
model.event_type.startsWith("RoomEncrypted")))
)
readonly property bool collapseAvatar: combine readonly property bool collapseAvatar: combine
readonly property bool hideAvatar: onRight readonly property bool hideAvatar: onRight