Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
bd8938b1
Commit
bd8938b1
authored
1 year ago
by
Capucine Berthet
Browse files
Options
Downloads
Patches
Plain Diff
TextMessageDelegate: resolve binding loop issue
Change-Id: Ia17240ba8ff20dd09ad58463e44fbcdc2156ed78
parent
1e4c4504
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/commoncomponents/SBSMessageBase.qml
+0
-1
0 additions, 1 deletion
src/app/commoncomponents/SBSMessageBase.qml
src/app/commoncomponents/TextMessageDelegate.qml
+6
-5
6 additions, 5 deletions
src/app/commoncomponents/TextMessageDelegate.qml
with
6 additions
and
6 deletions
src/app/commoncomponents/SBSMessageBase.qml
+
0
−
1
View file @
bd8938b1
...
...
@@ -54,7 +54,6 @@ Control {
property
bool
textHovered
:
false
property
alias
replyAnimation
:
selectAnimation
width
:
listView
.
width
height
:
mainColumnLayout
.
implicitHeight
property
real
textContentWidth
property
real
textContentHeight
...
...
This diff is collapsed.
Click to expand it.
src/app/commoncomponents/TextMessageDelegate.qml
+
6
−
5
View file @
bd8938b1
...
...
@@ -33,7 +33,7 @@ SBSMessageBase {
property
string
colorUrl
:
UtilsAdapter
.
luma
(
bubble
.
color
)
?
JamiTheme
.
chatviewLinkColorLight
:
JamiTheme
.
chatviewLinkColorDark
property
string
colorText
:
UtilsAdapter
.
luma
(
bubble
.
color
)
?
JamiTheme
.
chatviewTextColorLight
:
JamiTheme
.
chatviewTextColorDark
bigMsg
:
(
textEditId
.
lineCount
>
1
)
||
extraContent
.
active
Connections
{
target
:
bubble
...
...
@@ -46,6 +46,7 @@ SBSMessageBase {
}
}
isOutgoing
:
Author
===
CurrentAccount
.
uri
author
:
Author
readers
:
Readers
...
...
@@ -54,9 +55,11 @@ SBSMessageBase {
formattedDay
:
MessagesAdapter
.
getFormattedDay
(
Timestamp
)
extraHeight
:
extraContent
.
active
&&
!
isRemoteImage
?
msgRadius
:
-
isRemoteImage
textHovered
:
textHoverhandler
.
hovered
textContentWidth
:
textEditId
.
width
+
(
bigMsg
?
0
:
root
.
timeWidth
+
root
.
editedWidth
)
textContentWidth
:
textEditId
.
width
textContentHeight
:
textEditId
.
height
bigMsg
:
textContentWidth
>=
(
2
/
3
)
*
root
.
maxMsgWidth
||
extraContent
.
active
innerContent.children
:
[
TextEdit
{
id
:
textEditId
...
...
@@ -87,11 +90,9 @@ SBSMessageBase {
else
if
(
isEmojiOnly
)
Math
.
min
((
2
/
3
)
*
root
.
maxMsgWidth
,
implicitWidth
,
innerContent
.
width
-
senderMargin
-
(
innerContent
.
width
-
senderMargin
)
%
(
JamiTheme
.
chatviewEmojiSize
+
2
));
else
Math
.
max
(
Math
.
min
((
2
/
3
)
*
root
.
maxMsgWidth
-
(
bigMsg
?
0
:
root
.
timeWidth
+
root
.
editedWidth
),
implicitWidth
+
5
,
innerContent
.
width
-
senderMargin
+
5
),
bigMsg
?
root
.
timeWidth
+
root
.
editedWidth
+
14
:
0
)
;
Math
.
min
((
2
/
3
)
*
root
.
maxMsgWidth
,
implicitWidth
+
5
+
root
.
timeWidth
+
root
.
editedWidth
,
innerContent
.
width
-
senderMargin
+
5
+
root
.
timeWidth
+
root
.
editedWidth
)
;
}
anchors.rightMargin
:
bigMsg
?
0
:
root
.
timeWidth
+
root
.
editedWidth
wrapMode
:
Label
.
WrapAtWordBoundaryOrAnywhere
selectByMouse
:
true
font.pointSize
:
isEmojiOnly
?
JamiTheme
.
chatviewEmojiSize
:
(
ParsedBody
===
""
?
JamiTheme
.
smallFontSize
:
JamiTheme
.
mediumFontSize
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment