Skip to content
Snippets Groups Projects
Commit 030ed150 authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

conversationview: fix focus on callview

THis fixes mic and cam shortcuts

Change-Id: I51f8ea975a5d8bee0e9ceab712a58953646ce048
parent edeff74c
No related branches found
No related tags found
No related merge requests found
...@@ -51,7 +51,6 @@ void ...@@ -51,7 +51,6 @@ void
CurrentConversation::updateData() CurrentConversation::updateData()
{ {
auto convId = lrcInstance_->get_selectedConvUid(); auto convId = lrcInstance_->get_selectedConvUid();
set_id(convId);
if (convId.isEmpty()) if (convId.isEmpty())
return; return;
try { try {
...@@ -133,6 +132,7 @@ CurrentConversation::updateData() ...@@ -133,6 +132,7 @@ CurrentConversation::updateData()
} catch (...) { } catch (...) {
qWarning() << "Can't update current conversation data for" << convId; qWarning() << "Can't update current conversation data for" << convId;
} }
set_id(convId);
updateErrors(convId); updateErrors(convId);
} }
......
...@@ -80,6 +80,7 @@ BaseView { ...@@ -80,6 +80,7 @@ BaseView {
Qt.callLater(focusChatView) Qt.callLater(focusChatView)
} else { } else {
dismiss() dismiss()
callStackView.contentView.forceActiveFocus()
} }
} }
...@@ -88,6 +89,17 @@ BaseView { ...@@ -88,6 +89,17 @@ BaseView {
root.dismiss() root.dismiss()
} else { } else {
callStackView.chatViewContainer.visible = false 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 { ...@@ -97,6 +109,13 @@ BaseView {
id: callStackView id: callStackView
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
onVisibleChanged: {
if (visible)
contentView.forceActiveFocus()
else
chatView.focusChatView()
}
} }
} }
} }
...@@ -30,6 +30,7 @@ Item { ...@@ -30,6 +30,7 @@ Item {
id: root id: root
property alias chatViewContainer: ongoingCallPage.chatViewContainer property alias chatViewContainer: ongoingCallPage.chatViewContainer
property alias contentView: callStackMainView
property var sipKeys: [ property var sipKeys: [
"1", "2", "3", "A", "1", "2", "3", "A",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment