Commit c840bbab authored by Ronan's avatar Ronan

fix(Timeline.qml): do not anchors rectangle in ColumnLayout (Qt5.11)

parent ea6c5da0
......@@ -9,7 +9,7 @@ import 'Timeline.js' as Logic
// =============================================================================
ColumnLayout {
Rectangle {
id: timeline
// ---------------------------------------------------------------------------
......@@ -35,110 +35,108 @@ ColumnLayout {
// ---------------------------------------------------------------------------
spacing: 0
color: TimelineStyle.color
// ---------------------------------------------------------------------------
ColumnLayout {
anchors.fill: parent
spacing: 0
Connections {
target: model
// -------------------------------------------------------------------------
onDataChanged: Logic.handleDataChanged(topLeft, bottomRight, roles)
onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved (parent, first, last)
}
Connections {
target: model
// ---------------------------------------------------------------------------
Rectangle {
anchors.fill: parent
color: TimelineStyle.color
}
onDataChanged: Logic.handleDataChanged(topLeft, bottomRight, roles)
onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved(parent, first, last)
}
// ---------------------------------------------------------------------------
// Legend.
// ---------------------------------------------------------------------------
// -------------------------------------------------------------------------
// Legend.
// -------------------------------------------------------------------------
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: TimelineStyle.legend.height
color: TimelineStyle.legend.backgroundColor
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: TimelineStyle.legend.height
color: TimelineStyle.legend.backgroundColor
Row {
anchors {
fill: parent
leftMargin: TimelineStyle.legend.leftMargin
rightMargin: TimelineStyle.legend.rightMargin
}
spacing: TimelineStyle.legend.spacing
Row {
anchors {
fill: parent
leftMargin: TimelineStyle.legend.leftMargin
rightMargin: TimelineStyle.legend.rightMargin
}
spacing: TimelineStyle.legend.spacing
Icon {
anchors.verticalCenter: parent.verticalCenter
icon: 'history'
iconSize: TimelineStyle.legend.iconSize
}
Icon {
anchors.verticalCenter: parent.verticalCenter
icon: 'history'
iconSize: TimelineStyle.legend.iconSize
}
Text {
color: TimelineStyle.legend.color
font.pointSize: TimelineStyle.legend.pointSize
height: parent.height
text: qsTr('timelineTitle')
verticalAlignment: Text.AlignVCenter
Text {
color: TimelineStyle.legend.color
font.pointSize: TimelineStyle.legend.pointSize
height: parent.height
text: qsTr('timelineTitle')
verticalAlignment: Text.AlignVCenter
}
}
}
}
// ---------------------------------------------------------------------------
// History.
// ---------------------------------------------------------------------------
// -------------------------------------------------------------------------
// History.
// -------------------------------------------------------------------------
ScrollableListView {
id: view
Layout.fillHeight: true
Layout.fillWidth: true
currentIndex: -1
ScrollableListView {
id: view
Layout.fillHeight: true
Layout.fillWidth: true
currentIndex: -1
delegate: Item {
height: TimelineStyle.contact.height
width: parent ? parent.width : 0
Contact {
anchors.fill: parent
color: view.currentIndex === index
? TimelineStyle.contact.backgroundColor.selected
: (
index % 2 == 0
? TimelineStyle.contact.backgroundColor.a
: TimelineStyle.contact.backgroundColor.b
)
displayUnreadMessagesCount: SettingsModel.chatEnabled && view.currentIndex !== index
entry: $timelineEntry
sipAddressColor: view.currentIndex === index
? TimelineStyle.contact.sipAddress.color.selected
: TimelineStyle.contact.sipAddress.color.normal
usernameColor: view.currentIndex === index
? TimelineStyle.contact.username.color.selected
: TimelineStyle.contact.username.color.normal
Loader {
delegate: Item {
height: TimelineStyle.contact.height
width: parent ? parent.width : 0
Contact {
anchors.fill: parent
sourceComponent: TooltipArea {
text: $timelineEntry.timestamp.toLocaleString(
Qt.locale(App.locale),
Locale.ShortFormat
color: view.currentIndex === index
? TimelineStyle.contact.backgroundColor.selected
: (
index % 2 == 0
? TimelineStyle.contact.backgroundColor.a
: TimelineStyle.contact.backgroundColor.b
)
displayUnreadMessagesCount: SettingsModel.chatEnabled && view.currentIndex !== index
entry: $timelineEntry
sipAddressColor: view.currentIndex === index
? TimelineStyle.contact.sipAddress.color.selected
: TimelineStyle.contact.sipAddress.color.normal
usernameColor: view.currentIndex === index
? TimelineStyle.contact.username.color.selected
: TimelineStyle.contact.username.color.normal
Loader {
anchors.fill: parent
sourceComponent: TooltipArea {
text: $timelineEntry.timestamp.toLocaleString(
Qt.locale(App.locale),
Locale.ShortFormat
)
}
}
}
}
MouseArea {
anchors.fill: parent
onClicked: {
view.currentIndex = index
timeline.entrySelected($timelineEntry.sipAddress)
MouseArea {
anchors.fill: parent
onClicked: {
view.currentIndex = index
timeline.entrySelected($timelineEntry.sipAddress)
}
}
}
}
onCountChanged: Logic.handleCountChanged(count)
onCountChanged: Logic.handleCountChanged(count)
}
}
}
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