From 7466db0d64f5a36e5cfa829fbc078313e4ffb0e2 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 26 Sep 2016 16:18:09 +0200 Subject: [PATCH] fix(ForceScrollBar): use transparent color in background --- tests/ui/Linphone/Constants.qml | 3 ++- tests/ui/Linphone/Styles/PopupStyle.qml | 2 +- tests/ui/Linphone/Styles/ScrollBarStyle.qml | 2 +- tests/ui/Linphone/Styles/SearchBoxStyle.qml | 2 +- tests/ui/Views/MainWindow/MainWindow.qml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/ui/Linphone/Constants.qml b/tests/ui/Linphone/Constants.qml index e70699e86..90d2f83a8 100644 --- a/tests/ui/Linphone/Constants.qml +++ b/tests/ui/Linphone/Constants.qml @@ -7,10 +7,11 @@ QtObject { // TODO: Mutualize similar colors. property QtObject colors: QtObject { - property string a: '#808080' + property string a: 'transparent' property string b: '#5E5E5F' property string c: '#C5C5C5' property string d: '#5A585B' property string e: '#DEDEDE' + property string f: '#808080' } } diff --git a/tests/ui/Linphone/Styles/PopupStyle.qml b/tests/ui/Linphone/Styles/PopupStyle.qml index fd2f354a8..0a9d232e4 100644 --- a/tests/ui/Linphone/Styles/PopupStyle.qml +++ b/tests/ui/Linphone/Styles/PopupStyle.qml @@ -9,6 +9,6 @@ QtObject { property int horizontalOffset: 0 property int samples: 15 property int verticalOffset: 2 - property string color: Constants.colors.a + property string color: Constants.colors.f } } diff --git a/tests/ui/Linphone/Styles/ScrollBarStyle.qml b/tests/ui/Linphone/Styles/ScrollBarStyle.qml index 8e6e3195a..09465c218 100644 --- a/tests/ui/Linphone/Styles/ScrollBarStyle.qml +++ b/tests/ui/Linphone/Styles/ScrollBarStyle.qml @@ -8,7 +8,7 @@ QtObject { property string pressedColor: Constants.colors.b property Rectangle background: Rectangle { - color: Constants.colors.d + color: Constants.colors.a } property Rectangle contentItem: Rectangle { diff --git a/tests/ui/Linphone/Styles/SearchBoxStyle.qml b/tests/ui/Linphone/Styles/SearchBoxStyle.qml index 7314d8848..650c1a5a4 100644 --- a/tests/ui/Linphone/Styles/SearchBoxStyle.qml +++ b/tests/ui/Linphone/Styles/SearchBoxStyle.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import Linphone 1.0 QtObject { - property string shadowColor: Constants.colors.a + property string shadowColor: Constants.colors.f property Rectangle searchFieldBackground: Rectangle { implicitHeight: 30 diff --git a/tests/ui/Views/MainWindow/MainWindow.qml b/tests/ui/Views/MainWindow/MainWindow.qml index 2890c8934..27bc90c3a 100644 --- a/tests/ui/Views/MainWindow/MainWindow.qml +++ b/tests/ui/Views/MainWindow/MainWindow.qml @@ -167,7 +167,7 @@ ApplicationWindow { Loader { Layout.fillHeight: true Layout.fillWidth: true - source: 'qrc:/ui/Views/MainWindow/Home.qml' + source: 'qrc:/ui/Views/MainWindow/Conversation.qml' } }