diff --git a/tests/resources.qrc b/tests/resources.qrc index 45c3f6c6a..83bf7c6b2 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -38,6 +38,7 @@ ui/style/components/qmldir ui/style/components/DialogStyle.qml ui/style/components/ScrollBarStyle.qml + ui/style/components/TimelineStyle.qml ui/style/components/SearchBoxStyle.qml ui/style/components/CollapseStyle.qml ui/style/components/PopupStyle.qml diff --git a/tests/ui/components/timeline/Timeline.qml b/tests/ui/components/timeline/Timeline.qml index 73d2b8889..3c4d29c34 100644 --- a/tests/ui/components/timeline/Timeline.qml +++ b/tests/ui/components/timeline/Timeline.qml @@ -6,11 +6,14 @@ import 'qrc:/ui/components/contact' import 'qrc:/ui/components/image' import 'qrc:/ui/components/view' +import 'qrc:/ui/style/components' + ColumnLayout { id: item property var model + // Legend. Row { Layout.preferredHeight: 35 spacing: 30 @@ -28,12 +31,14 @@ ColumnLayout { } } + // Separator. Rectangle { Layout.fillWidth: true - Layout.preferredHeight: 1 - color: '#DEDEDE' + Layout.preferredHeight: TimelineStyle.separator.height + color: TimelineStyle.separator.color } + // History. ScrollableListView { Layout.fillHeight: true Layout.fillWidth: true diff --git a/tests/ui/style/components/DialogStyle.qml b/tests/ui/style/components/DialogStyle.qml index 72752c848..d510be8e6 100644 --- a/tests/ui/style/components/DialogStyle.qml +++ b/tests/ui/style/components/DialogStyle.qml @@ -18,7 +18,7 @@ QtObject { property QtObject description: QtObject { property int fontSize: 12 - property int height: 90 - property int minHeight: 25 + property int height: 90 // Height with text. + property int minHeight: 25 // Height without text. } } diff --git a/tests/ui/style/components/TimelineStyle.qml b/tests/ui/style/components/TimelineStyle.qml new file mode 100644 index 000000000..b87514001 --- /dev/null +++ b/tests/ui/style/components/TimelineStyle.qml @@ -0,0 +1,11 @@ +pragma Singleton +import QtQuick 2.7 + +import 'qrc:/ui/style/global' + +QtObject { + property QtObject separator: QtObject { + property int height: 1 + property string color: '#DEDEDE' + } +} diff --git a/tests/ui/style/components/qmldir b/tests/ui/style/components/qmldir index 5a9eb7e9a..bcc1be0f1 100644 --- a/tests/ui/style/components/qmldir +++ b/tests/ui/style/components/qmldir @@ -7,3 +7,4 @@ singleton DialogStyle 1.0 DialogStyle.qml singleton PopupStyle 1.0 PopupStyle.qml singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton ScrollBarStyle 1.0 ScrollBarStyle.qml +singleton TimelineStyle 1.0 TimelineStyle.qml