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
102c8861
Commit
102c8861
authored
Jun 28, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(App): little fixes
parent
da0b235d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ChatModel.cpp
src/components/chat/ChatModel.cpp
+2
-1
ChatStyle.qml
ui/modules/Linphone/Styles/Chat/ChatStyle.qml
+1
-1
No files found.
src/components/chat/ChatModel.cpp
View file @
102c8861
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
#include <QFileDialog>
#include <QFileDialog>
#include <QFileInfo>
#include <QFileInfo>
#include <QImage>
#include <QImage>
#include <QtDebug>
#include <QTimer>
#include <QTimer>
#include <QUuid>
#include <QUuid>
...
@@ -273,6 +272,8 @@ void ChatModel::setSipAddress (const QString &sipAddress) {
...
@@ -273,6 +272,8 @@ void ChatModel::setSipAddress (const QString &sipAddress) {
mChatRoom
=
core
->
getChatRoomFromUri
(
::
Utils
::
appStringToCoreString
(
sipAddress
));
mChatRoom
=
core
->
getChatRoomFromUri
(
::
Utils
::
appStringToCoreString
(
sipAddress
));
Q_CHECK_PTR
(
mChatRoom
.
get
());
Q_CHECK_PTR
(
mChatRoom
.
get
());
handleIsComposingChanged
(
mChatRoom
);
if
(
mChatRoom
->
getUnreadMessagesCount
()
>
0
)
if
(
mChatRoom
->
getUnreadMessagesCount
()
>
0
)
resetMessagesCount
();
resetMessagesCount
();
...
...
ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file @
102c8861
...
@@ -36,7 +36,7 @@ QtObject {
...
@@ -36,7 +36,7 @@ QtObject {
property
QtObject
composingText
:
QtObject
{
property
QtObject
composingText
:
QtObject
{
property
color
color
:
Colors
.
b
property
color
color
:
Colors
.
b
property
int
height
:
25
property
int
height
:
25
property
int
leftPadding
:
6
property
int
leftPadding
:
20
property
int
pointSize
:
Units
.
dp
*
9
property
int
pointSize
:
Units
.
dp
*
9
}
}
...
...
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