Skip to content
Snippets Groups Projects
Commit e74be093 authored by Capucine Berthet's avatar Capucine Berthet Committed by Sébastien Blin
Browse files

linkMessage: new design

GitLab: #1325
Change-Id: Id9b4e1430575fbf53f0657e94c9a27c5b35e4a93
parent a4b75861
Branches
Tags
No related merge requests found
...@@ -33,7 +33,7 @@ SBSMessageBase { ...@@ -33,7 +33,7 @@ SBSMessageBase {
property string colorUrl: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewLinkColorLight : JamiTheme.chatviewLinkColorDark property string colorUrl: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewLinkColorLight : JamiTheme.chatviewLinkColorDark
property string colorText: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark property string colorText: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark
bigMsg: textEditId.lineCount > 1 bigMsg: (textEditId.lineCount > 1) || extraContent.active
Connections { Connections {
target: bubble target: bubble
...@@ -142,7 +142,7 @@ SBSMessageBase { ...@@ -142,7 +142,7 @@ SBSMessageBase {
anchors.right: isOutgoing ? parent.right : undefined anchors.right: isOutgoing ? parent.right : undefined
property real minSize: 192 property real minSize: 192
property real maxSize: 320 property real maxSize: 400
active: LinkPreviewInfo.url !== undefined active: LinkPreviewInfo.url !== undefined
sourceComponent: ColumnLayout { sourceComponent: ColumnLayout {
id: previewContent id: previewContent
...@@ -200,7 +200,7 @@ SBSMessageBase { ...@@ -200,7 +200,7 @@ SBSMessageBase {
Layout.preferredWidth: img.width - 2 * hPadding Layout.preferredWidth: img.width - 2 * hPadding
Layout.leftMargin: hPadding Layout.leftMargin: hPadding
Layout.rightMargin: hPadding Layout.rightMargin: hPadding
spacing: 6 spacing: 4
Label { Label {
width: parent.width width: parent.width
font.pointSize: 10 font.pointSize: 10
...@@ -211,10 +211,11 @@ SBSMessageBase { ...@@ -211,10 +211,11 @@ SBSMessageBase {
color: root.colorText color: root.colorText
visible: LinkPreviewInfo.title.length > 0 visible: LinkPreviewInfo.title.length > 0
text: LinkPreviewInfo.title text: LinkPreviewInfo.title
lineHeight: 1.3
} }
Label { Label {
width: parent.width width: parent.width
font.pointSize: 11 font.pointSize: 10
font.hintingPreference: Font.PreferNoHinting font.hintingPreference: Font.PreferNoHinting
wrapMode: Label.WrapAtWordBoundaryOrAnywhere wrapMode: Label.WrapAtWordBoundaryOrAnywhere
renderType: Text.NativeRendering renderType: Text.NativeRendering
...@@ -223,6 +224,7 @@ SBSMessageBase { ...@@ -223,6 +224,7 @@ SBSMessageBase {
font.underline: root.hoveredLink font.underline: root.hoveredLink
text: LinkPreviewInfo.description text: LinkPreviewInfo.description
color: root.colorUrl color: root.colorUrl
lineHeight: 1.3
} }
Label { Label {
width: parent.width width: parent.width
...@@ -233,6 +235,7 @@ SBSMessageBase { ...@@ -233,6 +235,7 @@ SBSMessageBase {
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
color: root.colorText color: root.colorText
text: LinkPreviewInfo.domain text: LinkPreviewInfo.domain
lineHeight: 1.3
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment