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
214809ec
Commit
214809ec
authored
Feb 27, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Linphone/Styles/ChatStyle): use chat style, correct previous issue with qml cache
parent
37d0ac55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
Chat.qml
linphone-desktop/ui/modules/Linphone/Chat/Chat.qml
+2
-8
ChatStyle.qml
linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml
+2
-0
No files found.
linphone-desktop/ui/modules/Linphone/Chat/Chat.qml
View file @
214809ec
...
@@ -12,12 +12,6 @@ import Utils 1.0
...
@@ -12,12 +12,6 @@ import Utils 1.0
Rectangle
{
Rectangle
{
property
alias
proxyModel
:
chat
.
model
property
alias
proxyModel
:
chat
.
model
// Unable to use it in style file at this moment.
// A `TypeError: Cannot read property 'XXX' of undefined` is launched for many properties
// in the style file otherwise.
// Seems related to: https://bugreports.qt.io/browse/QTBUG-58648
property
color
_backgroundColor
:
'
white
'
property
bool
_bindToEnd
:
false
property
bool
_bindToEnd
:
false
property
var
_contactObserver
:
SipAddressesModel
.
getContactObserver
(
proxyModel
.
sipAddress
)
property
var
_contactObserver
:
SipAddressesModel
.
getContactObserver
(
proxyModel
.
sipAddress
)
...
@@ -27,7 +21,7 @@ Rectangle {
...
@@ -27,7 +21,7 @@ Rectangle {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
color
:
_backgroundC
olor
color
:
ChatStyle
.
c
olor
ColumnLayout
{
ColumnLayout
{
anchors.fill
:
parent
anchors.fill
:
parent
...
@@ -188,7 +182,7 @@ Rectangle {
...
@@ -188,7 +182,7 @@ Rectangle {
ChatStyle
.
entry
.
message
.
extraContent
.
leftMargin
+
ChatStyle
.
entry
.
message
.
extraContent
.
leftMargin
+
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
}
}
color
:
_backgroundC
olor
color
:
ChatStyle
.
c
olor
implicitHeight
:
layout
.
height
+
ChatStyle
.
entry
.
bottomMargin
implicitHeight
:
layout
.
height
+
ChatStyle
.
entry
.
bottomMargin
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
...
...
linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml
View file @
214809ec
...
@@ -6,6 +6,8 @@ import Common 1.0
...
@@ -6,6 +6,8 @@ import Common 1.0
// =============================================================================
// =============================================================================
QtObject
{
QtObject
{
property
color
color
:
Colors
.
k
property
QtObject
sectionHeading
:
QtObject
{
property
QtObject
sectionHeading
:
QtObject
{
property
int
padding
:
5
property
int
padding
:
5
property
int
bottomMargin
:
20
property
int
bottomMargin
:
20
...
...
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