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
8a064c3a
Commit
8a064c3a
authored
4 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
chatview: acquire message input focus when selecting conversation
Change-Id: I0f4ad161f0f05959c4f5a312e92f256b56c9fd57 Gitlab:
#107
parent
ac3b8b82
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/conversationsadapter.cpp
+16
-16
16 additions, 16 deletions
src/conversationsadapter.cpp
src/mainview/MainView.qml
+6
-0
6 additions, 0 deletions
src/mainview/MainView.qml
src/mainview/components/MessageWebView.qml
+3
-2
3 additions, 2 deletions
src/mainview/components/MessageWebView.qml
with
25 additions
and
18 deletions
src/conversationsadapter.cpp
+
16
−
16
View file @
8a064c3a
...
...
@@ -269,22 +269,22 @@ ConversationsAdapter::connectConversationModel(bool updateFilter)
emit
updateListViewRequested
();
});
filterChangedConnection_
=
QObject
::
connect
(
current
ConversationModel
,
&
lrc
::
api
::
ConversationModel
::
filterChanged
,
[
this
]()
{
conversationSmartListModel_
->
fillConversationsList
();
updateConversationsFilterWidget
();
emit
updateListViewRequested
();
});
newConversationConnection_
=
QObject
::
connect
(
current
Conversation
Model
,
&
lrc
::
api
::
ConversationModel
::
newConversation
,
[
this
](
const
QString
&
convUid
)
{
conversationSmartListModel_
->
fillConversationsList
();
updateConversationForNewContact
(
convUid
);
});
filterChangedConnection_
=
QObject
::
connect
(
currentConversationModel
,
&
lrc
::
api
::
ConversationModel
::
filterChanged
,
[
this
]()
{
conversationSmartListModel_
->
fillConversationsList
();
updateConversationsFilterWidget
();
emit
updateListViewRequested
();
});
newConversationConnection_
=
QObject
::
connect
(
currentConversationModel
,
&
lrc
::
api
::
ConversationModel
::
new
Conversation
,
[
this
](
const
QString
&
convUid
)
{
conversationSmartListModel_
->
fillConversationsList
();
updateConversationForNewContact
(
convUid
);
});
conversationRemovedConnection_
=
QObject
::
connect
(
currentConversationModel
,
...
...
This diff is collapsed.
Click to expand it.
src/mainview/MainView.qml
+
6
−
0
View file @
8a064c3a
...
...
@@ -442,6 +442,7 @@ Window {
SidePanel
{
id
:
mainViewWindowSidePanel
// TODO: remove the evil in this slot
onConversationSmartListNeedToAccessMessageWebView
:
{
communicationPageMessageWebView
.
headerUserAliasLabelText
=
currentUserAlias
communicationPageMessageWebView
.
headerUserUserNameLabelText
=
currentUserDisplayName
...
...
@@ -507,6 +508,10 @@ Window {
sidePanelViewStack
.
push
(
communicationPageMessageWebView
)
}
}
if
(
!
callStackViewShouldShow
)
{
communicationPageMessageWebView
.
focusMessageWebView
()
}
}
Connections
{
...
...
@@ -527,6 +532,7 @@ Window {
WelcomePage
{
id
:
welcomePage
visible
:
false
}
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/MessageWebView.qml
+
3
−
2
View file @
8a064c3a
...
...
@@ -39,6 +39,9 @@ Rectangle {
signal
messagesCleared
signal
messagesLoaded
function
focusMessageWebView
()
{
messageWebView
.
forceActiveFocus
()
}
function
webViewRunJavaScript
(
arg
)
{
messageWebView
.
runJavaScript
(
arg
)
...
...
@@ -189,7 +192,6 @@ Rectangle {
}
WebEngineView
{
id
:
messageWebView
anchors.top
:
messageWebViewHeader
.
bottom
...
...
@@ -270,7 +272,6 @@ Rectangle {
}
}
// Provide WebEngineProfile.
WebEngineProfile
{
id
:
messageWebViewProfile
...
...
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