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
09ed9e25
Commit
09ed9e25
authored
2 years ago
by
Aline Gondim Santos
Browse files
Options
Downloads
Patches
Plain Diff
fix: open fileDialog on one person swarm
GitLab:
#891
Change-Id: I97afae821dbb8cf20bf676804b8dafb66810bb3c
parent
4379e45c
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/app/mainview/components/ChatView.qml
+3
-1
3 additions, 1 deletion
src/app/mainview/components/ChatView.qml
src/app/mainview/components/MessageListView.qml
+6
-5
6 additions, 5 deletions
src/app/mainview/components/MessageListView.qml
with
9 additions
and
6 deletions
src/app/mainview/components/ChatView.qml
+
3
−
1
View file @
09ed9e25
...
...
@@ -57,9 +57,11 @@ Rectangle {
z
:
10
source
:
WITH_WEBENGINE
?
"
qrc:/webengine/map/MapPosition.qml
"
:
""
}
HostPopup
{
HostPopup
{
id
:
hostPopup
}
ColumnLayout
{
anchors.fill
:
root
...
...
This diff is collapsed.
Click to expand it.
src/app/mainview/components/MessageListView.qml
+
6
−
5
View file @
09ed9e25
...
...
@@ -44,13 +44,12 @@ JamiListView {
MessagesAdapter
.
loadMoreMessages
()
}
function
computeTimestampVisibility
(
item1
,
item1Index
,
item2
,
item2Index
)
{
if
(
item1
&&
item2
)
{
if
(
item1Index
<
item2Index
)
{
item1
.
showTime
=
item1
.
timestamp
-
item2
.
timestamp
>
JamiTheme
.
timestampIntervalTime
item1
.
showDay
=
item1
.
formattedDay
!==
item2
.
formattedDay
}
else
{
}
else
{
item2
.
showTime
=
item2
.
timestamp
-
item1
.
timestamp
>
JamiTheme
.
timestampIntervalTime
item2
.
showDay
=
item2
.
formattedDay
!==
item1
.
formattedDay
}
...
...
@@ -83,10 +82,10 @@ JamiListView {
}
// index 0 insertion = new message
if
(
itemIndex
===
0
)
{
Qt
.
callLater
(
computeSequencing
,
null
,
item
,
root
.
itemAtIndex
(
itemIndex
+
1
))
if
(
!
computeTimestampVisibility
(
item
,
itemIndex
,
nItem
,
nItemIndex
))
{
if
(
!
nItem
&&
!
CurrentConversation
.
allMessagesLoaded
)
Qt
.
callLater
(
computeChatview
,
item
,
itemIndex
)
}
else
computeSequencing
(
null
,
item
,
root
.
itemAtIndex
(
itemIndex
+
1
))
}
// top element
if
(
itemIndex
===
root
.
count
-
1
&&
CurrentConversation
.
allMessagesLoaded
)
{
...
...
@@ -152,6 +151,7 @@ JamiListView {
}
}
}
Connections
{
target
:
CurrentConversation
function
onIdChanged
()
{
fadeAnimation
.
start
()
}
...
...
@@ -268,6 +268,7 @@ JamiListView {
}
}
}
DelegateChoice
{
roleValue
:
Interaction
.
Type
.
DATA_TRANSFER
...
...
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