From 0fed6d80f85aacef767f7533c5efd88093b126d3 Mon Sep 17 00:00:00 2001 From: EndrII <EndrIIMail@gmail.com> Date: Mon, 22 Jun 2020 13:51:04 +0300 Subject: [PATCH] fix color --- .../src/ViewSolutionsModule/ViewPortGradientPage.qml | 6 +++++- ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml index 726e629..75ed2c2 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml @@ -43,7 +43,7 @@ ViewPortPage { GradientStop { position: 1.00; - color: "#33" + baseColor; + color: "#00" + baseColor; } } } @@ -60,6 +60,8 @@ ViewPortPage { font.bold: true font.pointSize: headerTextPointSize text: title; + color: fontColor + horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap @@ -87,6 +89,8 @@ ViewPortPage { verticalAlignment: Text.AlignVCenter width: parent.width / 2 text: root.text + color: fontColor + wrapMode: Text.WordWrap anchors.bottom: parent.bottom anchors.top: header.bottom diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml index ab424bd..78cd945 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml @@ -13,6 +13,7 @@ ViewPortDelegatBase { property int textMargins: 10 property int sourceTextPointSize: 20 property int headerTextPointSize: 32 + property color fontColor: ( Material.theme === Material.Light)? "#626465" : "#d2d5d8" property int additionalHeight: getBrCount(text) * sourceText.fontInfo.pixelSize + textMargins * 2 @@ -49,6 +50,7 @@ ViewPortDelegatBase { id: header font.bold: true font.pointSize: headerTextPointSize + color: fontColor text: title; horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -76,6 +78,8 @@ ViewPortDelegatBase { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter text: root.text + color: fontColor + wrapMode: Text.WordWrap anchors.bottom: parent.bottom anchors.top: header.bottom