Commit 214809ec authored by Ronan Abhamon's avatar Ronan Abhamon

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

parent 37d0ac55
...@@ -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: _backgroundColor color: ChatStyle.color
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: _backgroundColor color: ChatStyle.color
implicitHeight: layout.height + ChatStyle.entry.bottomMargin implicitHeight: layout.height + ChatStyle.entry.bottomMargin
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment