lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-24 08:44:03 +02:00
Code Activity

fix: open fileDialog on one person swarm

Browse source 
GitLab: #891
Change-Id: I97afae821dbb8cf20bf676804b8dafb66810bb3c
This commit is contained in:
Aline Gondim Santos 2022-11-30 08:49:52 -03:00
parent 4379e45c05
commit 09ed9e25ce
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/mainview/components/ChatView.qml
View file

@ -57,9 +57,11 @@ Rectangle {
z: 10 z: 10
source: WITH_WEBENGINE ? "qrc:/webengine/map/MapPosition.qml" : "" source: WITH_WEBENGINE ? "qrc:/webengine/map/MapPosition.qml" : ""
} }
HostPopup {
HostPopup {
id: hostPopup id: hostPopup
} }
ColumnLayout { ColumnLayout {
anchors.fill: root anchors.fill: root

11
src/app/mainview/components/MessageListView.qml
View file

@ -44,13 +44,12 @@ JamiListView {
MessagesAdapter.loadMoreMessages() MessagesAdapter.loadMoreMessages()
} }
function computeTimestampVisibility(item1, item1Index, item2, item2Index) { function computeTimestampVisibility(item1, item1Index, item2, item2Index) {
if (item1 && item2) { if (item1 && item2) {
if (item1Index < item2Index) { if (item1Index < item2Index) {
item1.showTime = item1.timestamp - item2.timestamp > JamiTheme.timestampIntervalTime item1.showTime = item1.timestamp - item2.timestamp > JamiTheme.timestampIntervalTime
item1.showDay = item1.formattedDay !== item2.formattedDay item1.showDay = item1.formattedDay !== item2.formattedDay
}else { } else {
item2.showTime = item2.timestamp - item1.timestamp > JamiTheme.timestampIntervalTime item2.showTime = item2.timestamp - item1.timestamp > JamiTheme.timestampIntervalTime
item2.showDay = item2.formattedDay !== item1.formattedDay item2.showDay = item2.formattedDay !== item1.formattedDay
} }
@ -83,10 +82,10 @@ JamiListView {
} }
// index 0 insertion = new message // index 0 insertion = new message
if (itemIndex === 0) { if (itemIndex === 0) {
Qt.callLater(computeSequencing, null, item, root.itemAtIndex(itemIndex + 1)) if (!nItem && !CurrentConversation.allMessagesLoaded)
if (!computeTimestampVisibility(item, itemIndex, nItem, nItemIndex)) {
Qt.callLater(computeChatview, item, itemIndex) Qt.callLater(computeChatview, item, itemIndex)
} else
computeSequencing( null, item, root.itemAtIndex(itemIndex + 1))
} }
// top element // top element
if(itemIndex === root.count - 1 && CurrentConversation.allMessagesLoaded) { if(itemIndex === root.count - 1 && CurrentConversation.allMessagesLoaded) {
@ -152,6 +151,7 @@ JamiListView {
} }
} }
} }
Connections { Connections {
target: CurrentConversation target: CurrentConversation
function onIdChanged() { fadeAnimation.start() } function onIdChanged() { fadeAnimation.start() }
@ -268,6 +268,7 @@ JamiListView {
} }
} }
} }
DelegateChoice { DelegateChoice {
roleValue: Interaction.Type.DATA_TRANSFER roleValue: Interaction.Type.DATA_TRANSFER