lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

conversationview: fix focus on callview

Browse source 
THis fixes mic and cam shortcuts

Change-Id: I51f8ea975a5d8bee0e9ceab712a58953646ce048
This commit is contained in:
Aline Gondim Santos 2023-02-28 17:40:53 -03:00
parent edeff74c52
commit 030ed15021
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/currentconversation.cpp
View file

@ -51,7 +51,6 @@ void
CurrentConversation::updateData()
{
auto convId = lrcInstance_->get_selectedConvUid();
set_id(convId);
if (convId.isEmpty())
return;
try {
@ -133,6 +132,7 @@ CurrentConversation::updateData()
} catch (...) {
qWarning() << "Can't update current conversation data for" << convId;
}
set_id(convId);
updateErrors(convId);
}

19
src/app/mainview/ConversationView.qml
View file

@ -80,6 +80,7 @@ BaseView {
Qt.callLater(focusChatView)
} else {
dismiss()
callStackView.contentView.forceActiveFocus()
}
}
@ -88,6 +89,17 @@ BaseView {
root.dismiss()
} else {
callStackView.chatViewContainer.visible = false
callStackView.contentView.forceActiveFocus()
}
}
onVisibleChanged: {
if (!inCallView)
return
if (visible && !parent.showDetails) {
focusChatView()
} else {
callStackView.contentView.forceActiveFocus()
}
}
}
@ -97,6 +109,13 @@ BaseView {
id: callStackView
Layout.fillWidth: true
Layout.fillHeight: true
onVisibleChanged: {
if (visible)
contentView.forceActiveFocus()
else
chatView.focusChatView()
}
}
}
}

1
src/app/mainview/components/CallStackView.qml
View file

@ -30,6 +30,7 @@ Item {
id: root
property alias chatViewContainer: ongoingCallPage.chatViewContainer
property alias contentView: callStackMainView
property var sipKeys: [
"1", "2", "3", "A",