diff --git a/tests/resources.qrc b/tests/resources.qrc index c4a6a3d3a..68170319f 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -62,6 +62,7 @@ ui/modules/Linphone/Styles/DialogStyle.qml ui/modules/Linphone/Styles/ForceScrollBarStyle.qml ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml + ui/modules/Linphone/Styles/Form/ActionBarStyle.qml ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml diff --git a/tests/ui/modules/Linphone/Form/ActionBar.qml b/tests/ui/modules/Linphone/Form/ActionBar.qml index 335880879..7d0133aab 100644 --- a/tests/ui/modules/Linphone/Form/ActionBar.qml +++ b/tests/ui/modules/Linphone/Form/ActionBar.qml @@ -1,10 +1,13 @@ import QtQuick 2.7 +import Linphone.Styles 1.0 + // =================================================================== // Bar which can contains ActionButtons. // =================================================================== Row { - property int iconSize - spacing: 8 + property int iconSize + + spacing: ActionBarStyle.spacing } diff --git a/tests/ui/modules/Linphone/Form/ActionButton.qml b/tests/ui/modules/Linphone/Form/ActionButton.qml index fde44ea6e..8a621b591 100644 --- a/tests/ui/modules/Linphone/Form/ActionButton.qml +++ b/tests/ui/modules/Linphone/Form/ActionButton.qml @@ -8,16 +8,19 @@ import Linphone 1.0 // =================================================================== Button { - property int iconSize - property alias icon: icon.icon + property alias icon: icon.icon + property int iconSize - // Ugly hack, use current size, ActionBar size, - // or other parent height. - height: iconSize || parent.iconSize || parent.height - width: iconSize || parent.iconSize || parent.height + flat: true - Icon { - anchors.fill: parent - id: icon - } + // Ugly hack, use current size, ActionBar size, + // or other parent height. + height: iconSize || parent.iconSize || parent.height + width: iconSize || parent.iconSize || parent.height + + Icon { + id: icon + + anchors.fill: parent + } } diff --git a/tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml b/tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml new file mode 100644 index 000000000..b138bb432 --- /dev/null +++ b/tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml @@ -0,0 +1,6 @@ +pragma Singleton +import QtQuick 2.7 + +QtObject { + property int spacing: 8 +} diff --git a/tests/ui/modules/Linphone/Styles/qmldir b/tests/ui/modules/Linphone/Styles/qmldir index 85505b906..539dff7c5 100644 --- a/tests/ui/modules/Linphone/Styles/qmldir +++ b/tests/ui/modules/Linphone/Styles/qmldir @@ -12,6 +12,7 @@ singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton TimelineStyle 1.0 TimelineStyle.qml singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml +singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml