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
3855a5e9
Unverified
Commit
3855a5e9
authored
1 year ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
chatview: fix footer visibility
Change-Id: I4bb6268547da6549a143da1d64b56f70cdd7dcc7
parent
6689bce7
No related branches found
Branches containing commit
Tags
beta/202402071743
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/mainview/components/ChatView.qml
+4
-8
4 additions, 8 deletions
src/app/mainview/components/ChatView.qml
tests/qml/src/tst_ChatView.qml
+10
-0
10 additions, 0 deletions
tests/qml/src/tst_ChatView.qml
with
14 additions
and
8 deletions
src/app/mainview/components/ChatView.qml
+
4
−
8
View file @
3855a5e9
...
...
@@ -21,7 +21,6 @@ import net.jami.Models 1.1
import
net
.
jami
.
Adapters
1.1
import
net
.
jami
.
Constants
1.1
import
net
.
jami
.
Enums
1.1
import
"
../../commoncomponents
"
import
"
../js/pluginhandlerpickercreation.js
"
as
PluginHandlerPickerCreation
...
...
@@ -135,7 +134,7 @@ Rectangle {
function
onIdChanged
()
{
if
(
!
chatViewHeader
.
interactionButtonsVisibility
)
extrasPanel
.
closePanel
()
extrasPanel
.
closePanel
()
;
}
function
onNeedsHost
()
{
...
...
@@ -251,14 +250,10 @@ Rectangle {
chatContents
.
visible
=
true
;
return
;
}
const
isExpanding
=
width
>
previousWidth
;
// Provide a detailed log here, as this function seems problematic.
console
.
debug
(
"
ChatViewSplitView.resolvePanes: f: %1 w: %2 pw: %3 epw: %4 pepw: %5 ie: %6
"
.
arg
(
force
).
arg
(
width
).
arg
(
previousWidth
)
.
arg
(
extrasPanelWidth
).
arg
(
previousExtrasPanelWidth
).
arg
(
isExpanding
));
console
.
debug
(
"
ChatViewSplitView.resolvePanes: f: %1 w: %2 pw: %3 epw: %4 pepw: %5 ie: %6
"
.
arg
(
force
).
arg
(
width
).
arg
(
previousWidth
).
arg
(
extrasPanelWidth
).
arg
(
previousExtrasPanelWidth
).
arg
(
isExpanding
));
const
maximizePredicate
=
(
!
isExpanding
||
force
)
&&
chatContents
.
visible
;
const
minimizePredicate
=
(
isExpanding
||
force
)
&&
!
chatContents
.
visible
;
const
mainViewMinWidth
=
JamiTheme
.
mainViewPaneMinWidth
;
...
...
@@ -323,6 +318,7 @@ Rectangle {
ChatViewFooter
{
id
:
chatViewFooter
objectName
:
"
chatViewFooter
"
visible
:
{
if
(
CurrentAccount
.
type
===
Profile
.
Type
.
SIP
)
...
...
@@ -333,7 +329,7 @@ Rectangle {
return
false
;
else
if
(
CurrentConversation
.
isRequest
)
return
false
;
return
CurrentConversation
.
isSwarm
;
return
CurrentConversation
.
isSwarm
||
CurrentConversation
.
isTemporary
;
}
onHeightChanged
:
{
...
...
This diff is collapsed.
Click to expand it.
tests/qml/src/tst_ChatView.qml
+
10
−
0
View file @
3855a5e9
...
...
@@ -49,6 +49,16 @@ ListSelectionView {
var
sendContactRequestButton
=
findChild
(
chatviewHeader
,
"
sendContactRequestButton
"
)
compare
(
detailsButton
.
visible
,
true
)
compare
(
sendContactRequestButton
.
visible
,
false
)
var
chatViewFooter
=
findChild
(
uut
,
"
chatViewFooter
"
)
CurrentConversation
.
isTemporary
=
true
compare
(
chatViewFooter
.
visible
,
true
)
CurrentConversation
.
isTemporary
=
false
CurrentConversation
.
isRequest
=
true
compare
(
chatViewFooter
.
visible
,
false
)
CurrentConversation
.
isRequest
=
false
CurrentConversation
.
needsSyncing
=
true
compare
(
chatViewFooter
.
visible
,
false
)
}
}
}
...
...
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