diff --git a/tests/ui/modules/Linphone/Constants.qml b/tests/ui/modules/Linphone/Constants.qml index 9800447ef..bada88ca0 100644 --- a/tests/ui/modules/Linphone/Constants.qml +++ b/tests/ui/modules/Linphone/Constants.qml @@ -22,5 +22,6 @@ QtObject { property string j: '#434343' // MenuEntry Selected. property string k: '#FFFFFF' // Text color. + property string l: '#000000' // Text color. } } diff --git a/tests/ui/modules/Linphone/Dialog/DialogDescription.qml b/tests/ui/modules/Linphone/Dialog/DialogDescription.qml index 987ea3c10..71a5968ea 100644 --- a/tests/ui/modules/Linphone/Dialog/DialogDescription.qml +++ b/tests/ui/modules/Linphone/Dialog/DialogDescription.qml @@ -9,10 +9,10 @@ import Linphone.Styles 1.0 Item { property alias text: description.text - height: (!text && DialogStyle.description.verticalMargin) || undefined - implicitHeight: (text && ( - description.implicitHeight + DialogStyle.description.verticalMargin * 2 - )) || 0 + height: !text ? DialogStyle.description.verticalMargin : undefined + implicitHeight: text + ? description.implicitHeight + DialogStyle.description.verticalMargin * 2 + : 0 Text { id: description @@ -20,6 +20,7 @@ Item { anchors.fill: parent anchors.leftMargin: DialogStyle.leftMargin anchors.rightMargin: DialogStyle.rightMargin + color: DialogStyle.description.color font.pointSize: DialogStyle.description.fontSize verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap diff --git a/tests/ui/modules/Linphone/Dialog/DialogPlus.qml b/tests/ui/modules/Linphone/Dialog/DialogPlus.qml index 8ea4b0d00..36272ca06 100644 --- a/tests/ui/modules/Linphone/Dialog/DialogPlus.qml +++ b/tests/ui/modules/Linphone/Dialog/DialogPlus.qml @@ -56,9 +56,13 @@ Window { Row { id: buttons - Layout.alignment: (centeredButtons && Qt.AlignHCenter) || Qt.AlignLeft + Layout.alignment: centeredButtons + ? Qt.AlignHCenter + : Qt.AlignLeft Layout.bottomMargin: DialogStyle.buttons.bottomMargin - Layout.leftMargin: (!centeredButtons && DialogStyle.leftMargin) || undefined + Layout.leftMargin: !centeredButtons + ? DialogStyle.leftMargin + : undefined Layout.topMargin: DialogStyle.buttons.topMargin spacing: DialogStyle.buttons.spacing } diff --git a/tests/ui/modules/Linphone/Styles/DialogStyle.qml b/tests/ui/modules/Linphone/Styles/DialogStyle.qml index 36e3d8ba1..1faddf315 100644 --- a/tests/ui/modules/Linphone/Styles/DialogStyle.qml +++ b/tests/ui/modules/Linphone/Styles/DialogStyle.qml @@ -1,6 +1,8 @@ pragma Singleton import QtQuick 2.7 +import Linphone 1.0 + QtObject { property int leftMargin: 50 property int rightMargin: 50 @@ -19,5 +21,6 @@ QtObject { property QtObject description: QtObject { property int fontSize: 12 property int verticalMargin: 25 + property string color: Constants.colors.l } }