Fix own medias in events positions
This commit is contained in:
parent
a3d2fc9b98
commit
9de34d4d3f
|
@ -11,7 +11,7 @@ HRowLayout {
|
||||||
|
|
||||||
readonly property string eventText: Utils.processedEventText(model)
|
readonly property string eventText: Utils.processedEventText(model)
|
||||||
readonly property string eventTime: Utils.formatTime(model.date, false)
|
readonly property string eventTime: Utils.formatTime(model.date, false)
|
||||||
readonly property bool pureMedia: ! eventText && previewLinksRepeater.count
|
readonly property bool pureMedia: ! eventText && linksRepeater.count
|
||||||
|
|
||||||
readonly property string hoveredLink: contentLabel.hoveredLink
|
readonly property string hoveredLink: contentLabel.hoveredLink
|
||||||
readonly property bool hoveredSelectable: contentHover.hovered
|
readonly property bool hoveredSelectable: contentHover.hovered
|
||||||
|
@ -20,6 +20,12 @@ HRowLayout {
|
||||||
width - (avatarWrapper.visible ? avatarWrapper.width : 0) -
|
width - (avatarWrapper.visible ? avatarWrapper.width : 0) -
|
||||||
totalSpacing
|
totalSpacing
|
||||||
|
|
||||||
|
readonly property int xOffset:
|
||||||
|
onRight ?
|
||||||
|
contentLabel.width - contentLabel.paintedWidth -
|
||||||
|
contentLabel.leftPadding - contentLabel.rightPadding :
|
||||||
|
0
|
||||||
|
|
||||||
|
|
||||||
TapHandler {
|
TapHandler {
|
||||||
enabled: debugMode
|
enabled: debugMode
|
||||||
|
@ -27,8 +33,6 @@ HRowLayout {
|
||||||
Utils.debug(eventContent, con => { con.runJS("json()") })
|
Utils.debug(eventContent, con => { con.runJS("json()") })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: avatarWrapper
|
id: avatarWrapper
|
||||||
opacity: collapseAvatar ? 0 : 1
|
opacity: collapseAvatar ? 0 : 1
|
||||||
|
@ -93,12 +97,7 @@ HRowLayout {
|
||||||
" <font size=" + theme.fontSize.small +
|
" <font size=" + theme.fontSize.small +
|
||||||
"px>⏳</font>" : "")
|
"px>⏳</font>" : "")
|
||||||
|
|
||||||
transform: Translate {
|
transform: Translate { x: xOffset }
|
||||||
x: onRight ?
|
|
||||||
contentLabel.width - contentLabel.paintedWidth -
|
|
||||||
contentLabel.leftPadding - contentLabel.rightPadding :
|
|
||||||
0
|
|
||||||
}
|
|
||||||
|
|
||||||
Layout.maximumWidth: Math.min(
|
Layout.maximumWidth: Math.min(
|
||||||
// 600px with 16px font
|
// 600px with 16px font
|
||||||
|
@ -124,7 +123,7 @@ HRowLayout {
|
||||||
parent.paintedWidth +
|
parent.paintedWidth +
|
||||||
parent.leftPadding + parent.rightPadding,
|
parent.leftPadding + parent.rightPadding,
|
||||||
|
|
||||||
previewLinksRepeater.childrenWidth +
|
linksRepeater.childrenWidth +
|
||||||
(pureMedia ? 0 : parent.leftPadding + parent.rightPadding),
|
(pureMedia ? 0 : parent.leftPadding + parent.rightPadding),
|
||||||
)
|
)
|
||||||
height: contentColumn.height
|
height: contentColumn.height
|
||||||
|
@ -136,13 +135,15 @@ HRowLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
HRepeater {
|
HRepeater {
|
||||||
id: previewLinksRepeater
|
id: linksRepeater
|
||||||
model: eventDelegate.currentItem.links
|
model: eventDelegate.currentItem.links
|
||||||
|
|
||||||
EventMediaLoader {
|
EventMediaLoader {
|
||||||
info: eventDelegate.currentItem
|
info: eventDelegate.currentItem
|
||||||
mediaUrl: modelData
|
mediaUrl: modelData
|
||||||
|
|
||||||
|
transform: Translate { x: xOffset }
|
||||||
|
|
||||||
Layout.bottomMargin: contentLabel.bottomPadding * multiply
|
Layout.bottomMargin: contentLabel.bottomPadding * multiply
|
||||||
Layout.leftMargin: contentLabel.leftPadding * multiply
|
Layout.leftMargin: contentLabel.leftPadding * multiply
|
||||||
Layout.rightMargin: contentLabel.rightPadding * multiply
|
Layout.rightMargin: contentLabel.rightPadding * multiply
|
||||||
|
|
Loading…
Reference in New Issue
Block a user