Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
21e74f27
Commit
21e74f27
authored
Aug 04, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(chat): display correctly busy indicator when a message is sent
parent
bfef4187
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
5 deletions
+29
-5
Chat.qml
ui/modules/Linphone/Chat/Chat.qml
+1
-1
FileMessage.qml
ui/modules/Linphone/Chat/FileMessage.qml
+14
-2
OutgoingMessage.qml
ui/modules/Linphone/Chat/OutgoingMessage.qml
+12
-2
ChatStyle.qml
ui/modules/Linphone/Styles/Chat/ChatStyle.qml
+2
-0
No files found.
ui/modules/Linphone/Chat/Chat.qml
View file @
21e74f27
...
...
@@ -137,7 +137,7 @@ Rectangle {
ChatStyle
.
entry
.
message
.
extraContent
.
spacing
+
ChatStyle
.
entry
.
message
.
extraContent
.
rightMargin
+
ChatStyle
.
entry
.
message
.
extraContent
.
leftMargin
+
ChatStyle
.
entry
.
message
.
outgoing
.
sendIcon
Size
ChatStyle
.
entry
.
message
.
outgoing
.
area
Size
}
color
:
ChatStyle
.
color
...
...
ui/modules/Linphone/Chat/FileMessage.qml
View file @
21e74f27
...
...
@@ -284,6 +284,8 @@ Row {
id
:
icon
Icon
{
anchors.centerIn
:
parent
icon
:
rectangle
.
isNotDelivered
?
'
chat_error
'
:
(
rectangle
.
isRead
?
'
chat_read
'
:
'
chat_delivered
'
)
...
...
@@ -299,12 +301,22 @@ Row {
Component
{
id
:
indicator
BusyIndicator
{}
Item
{
anchors.fill
:
parent
BusyIndicator
{
anchors.centerIn
:
parent
height
:
ChatStyle
.
entry
.
message
.
outgoing
.
busyIndicatorSize
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
busyIndicatorSize
}
}
}
Loader
{
height
:
ChatStyle
.
entry
.
lineHeight
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIcon
Size
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
area
Size
sourceComponent
:
$chatEntry
.
isOutgoing
?
(
...
...
ui/modules/Linphone/Chat/OutgoingMessage.qml
View file @
21e74f27
...
...
@@ -62,12 +62,22 @@ Item {
Component
{
id
:
indicator
BusyIndicator
{}
Item
{
anchors.fill
:
parent
BusyIndicator
{
anchors.centerIn
:
parent
height
:
ChatStyle
.
entry
.
message
.
outgoing
.
busyIndicatorSize
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
busyIndicatorSize
}
}
}
Loader
{
height
:
ChatStyle
.
entry
.
lineHeight
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIcon
Size
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
area
Size
sourceComponent
:
$chatEntry
.
status
===
ChatModel
.
MessageStatusInProgress
?
indicator
...
...
ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file @
21e74f27
...
...
@@ -122,6 +122,8 @@ QtObject {
property
QtObject
outgoing
:
QtObject
{
property
color
backgroundColor
:
Colors
.
e
property
int
areaSize
:
16
property
int
busyIndicatorSize
:
16
property
int
sendIconSize
:
12
property
QtObject
text
:
QtObject
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment