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
3ef4d3dd
Commit
3ef4d3dd
authored
4 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
smartlist: always refocus to chatview when showing a conversation
Gitlab:
#116
Change-Id: Ibf2fdf3eeeb2e36c08450ef99ac42ca48913a0ed
parent
5f272b33
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mainview/MainView.qml
+12
-7
12 additions, 7 deletions
src/mainview/MainView.qml
src/mainview/components/SidePanel.qml
+3
-0
3 additions, 0 deletions
src/mainview/components/SidePanel.qml
with
15 additions
and
7 deletions
src/mainview/MainView.qml
+
12
−
7
View file @
3ef4d3dd
...
...
@@ -442,6 +442,10 @@ Window {
SidePanel
{
id
:
mainViewWindowSidePanel
onFocusMessageWebViewRequested
:
{
communicationPageMessageWebView
.
focusMessageWebView
()
}
// TODO: remove the evil in this slot
onConversationSmartListNeedToAccessMessageWebView
:
{
communicationPageMessageWebView
.
headerUserAliasLabelText
=
currentUserAlias
...
...
@@ -475,12 +479,14 @@ Window {
callStackView
.
setLinkedWebview
(
communicationPageMessageWebView
)
if
(
mainViewStack
.
find
(
function
(
item
,
index
)
{
return
item
.
objectName
===
"
communicationPageMessageWebView
"
})
||
sidePanelViewStack
.
find
(
function
(
item
,
index
)
{
return
item
.
objectName
===
"
communicationPageMessageWebView
"
}))
{
if
(
!
callStackViewShouldShow
)
return
item
.
objectName
===
"
communicationPageMessageWebView
"
})
||
sidePanelViewStack
.
find
(
function
(
item
,
index
)
{
return
item
.
objectName
===
"
communicationPageMessageWebView
"
}))
{
if
(
!
callStackViewShouldShow
)
{
communicationPageMessageWebView
.
focusMessageWebView
()
return
}
}
// Push messageWebView or callStackView onto the correct stackview
...
...
@@ -509,9 +515,8 @@ Window {
}
}
if
(
!
callStackViewShouldShow
)
{
if
(
!
callStackViewShouldShow
)
communicationPageMessageWebView
.
focusMessageWebView
()
}
}
Connections
{
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/SidePanel.qml
+
3
−
0
View file @
3ef4d3dd
...
...
@@ -34,6 +34,7 @@ Rectangle {
property
int
totalUnreadMessagesCount
:
0
signal
conversationSmartListNeedToAccessMessageWebView
(
string
currentUserDisplayName
,
string
currentUserAlias
,
string
currentUID
,
bool
callStackViewShouldShow
,
bool
isAudioOnly
,
int
callState
)
signal
focusMessageWebViewRequested
// Hack -> force redraw.
function
forceReselectConversationSmartListCurrentIndex
()
{
...
...
@@ -175,6 +176,8 @@ Rectangle {
height
:
tabBarVisible
?
sidePanelRect
.
height
-
sidePanelTabBar
.
height
-
contactSearchBar
.
height
-
20
:
sidePanelRect
.
height
-
contactSearchBar
.
height
-
20
onCurrentIndexChanged
:
focusMessageWebViewRequested
()
Connections
{
target
:
ConversationsAdapter
...
...
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