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
6174c0cb
Commit
6174c0cb
authored
3 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
participantsoverlay: avoid freeze and async load
Change-Id: I54d7a5c413cf8c1fa5b43ea1f0f03b4ee9fbaf12 GitLab:
#476
parent
05f38852
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/calladapter.cpp
+2
-4
2 additions, 4 deletions
src/calladapter.cpp
src/mainview/components/ParticipantsLayer.qml
+14
-1
14 additions, 1 deletion
src/mainview/components/ParticipantsLayer.qml
with
16 additions
and
5 deletions
src/calladapter.cpp
+
2
−
4
View file @
6174c0cb
...
...
@@ -478,8 +478,7 @@ CallAdapter::onShowIncomingCallView(const QString& accountId, const QString& con
void
CallAdapter
::
onShowCallView
(
const
QString
&
accountId
,
const
QString
&
convUid
)
{
updateCall
(
convUid
,
accountId
);
Q_EMIT
lrcInstance_
->
conversationUpdated
(
convUid
,
accountId
);
Q_EMIT
lrcInstance_
->
conversationUpdated
(
convUid
,
accountId
);
// This will show the call
}
void
...
...
@@ -489,8 +488,7 @@ CallAdapter::updateCall(const QString& convUid, const QString& accountId, bool f
return
;
accountId_
=
accountId
.
isEmpty
()
?
accountId_
:
accountId
;
const
auto
&
convInfo
=
lrcInstance_
->
getConversationFromConvUid
(
lrcInstance_
->
get_selectedConvUid
());
const
auto
&
convInfo
=
lrcInstance_
->
getConversationFromConvUid
(
convUid
);
if
(
convInfo
.
uid
.
isEmpty
())
{
return
;
}
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/ParticipantsLayer.qml
+
14
−
1
View file @
6174c0cb
...
...
@@ -192,7 +192,16 @@ Item {
model
:
GenericParticipantsFilterModel
delegate
:
Loader
{
sourceComponent
:
callVideoMedia
visible
:
inLine
?
index
>=
genericParticipantsRect
.
currentPos
&&
index
<
genericParticipantsRect
.
currentPos
+
genericParticipantsRect
.
showable
:
true
active
:
root
.
visible
asynchronous
:
true
visible
:
{
if
(
status
!==
Loader
.
Ready
)
return
false
if
(
inLine
)
return
index
>=
genericParticipantsRect
.
currentPos
&&
index
<
genericParticipantsRect
.
currentPos
+
genericParticipantsRect
.
showable
return
true
}
width
:
{
var
lastLine
=
commonParticipants
.
count
%
commonParticipantsFlow
.
columns
var
horComponents
=
((
commonParticipants
.
count
-
index
)
>
lastLine
||
index
<
0
)
?
commonParticipantsFlow
.
columns
:
lastLine
...
...
@@ -244,7 +253,11 @@ Item {
model
:
ActiveParticipantsFilterModel
delegate
:
Loader
{
active
:
root
.
visible
asynchronous
:
true
sourceComponent
:
callVideoMedia
visible
:
status
==
Loader
.
Ready
width
:
Math
.
ceil
(
activeParticipantsFlow
.
width
/
activeParticipantsFlow
.
columns
)
-
activeParticipantsFlow
.
columnsSpacing
height
:
Math
.
ceil
(
activeParticipantsFlow
.
height
/
activeParticipantsFlow
.
rows
)
-
activeParticipantsFlow
.
rowsSpacing
...
...
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