mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-03 22:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(ui/modules/Linphone/Styles/ChatStyle): use chat style, correct previous issue with qml cache

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-27 15:56:23 +01:00
parent 37d0ac557f
commit 214809ecce
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linphone-desktop/ui/modules/Linphone/Chat/Chat.qml
View file

@ -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 {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
color: _backgroundColor color: ChatStyle.color
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
@ -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: _backgroundColor color: ChatStyle.color
implicitHeight: layout.height + ChatStyle.entry.bottomMargin implicitHeight: layout.height + ChatStyle.entry.bottomMargin
// --------------------------------------------------------------------- // ---------------------------------------------------------------------

2
linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml
View file

@ -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